From 1d55279cd2a2fa824412583b04724c5521ef97e5 Mon Sep 17 00:00:00 2001
From: Delphine <delphine.coursier@teamdlab.com>
Date: Mon, 30 Nov 2020 10:51:12 +0100
Subject: [PATCH] [FIX TRTL-495] fix domain input css
[FIX TRTL-499] Fix owner preview buttons color
[FIX TRTL-497] Fix textarea disabled background color
[FIX TRTL-502] Fix side panel with long title
[FIX TRTL-502] Fix side panel uppercase title
[FIX TRTL-512] fix css client input subrogation
[FIX TRTL-498] fix edit input css
---
.../select-customer.component.scss | 19 ++++++------
.../vitamui-body/vitamui-body.component.scss | 30 +------------------
.../vitamui-textarea.component.scss | 5 ++--
.../src/sass/_editable-field.scss | 2 +-
.../src/sass/_sidepanel.scss | 9 +++---
.../src/app/customer/customer.component.html | 2 +-
.../owner-preview.component.html | 4 +--
.../domains-input.component.html | 7 ++---
8 files changed, 26 insertions(+), 52 deletions(-)
diff --git a/ui/ui-frontend-common/src/app/modules/components/header/select-customer/select-customer.component.scss b/ui/ui-frontend-common/src/app/modules/components/header/select-customer/select-customer.component.scss
index 9d912836c..a0aa09a3b 100644
--- a/ui/ui-frontend-common/src/app/modules/components/header/select-customer/select-customer.component.scss
+++ b/ui/ui-frontend-common/src/app/modules/components/header/select-customer/select-customer.component.scss
@@ -1,20 +1,20 @@
@import '../../../../../sass/variables/colors';
:host::ng-deep {
-
+
.selected-customer-label, .unselected-customer-label {
- color: $warm-grey;
+ color: var(--vitamui-grey-600);
font-size: 16px;
}
.mat-form-field-underline {
display: none;
}
-
+
.mat-select-value-text {
font-weight: bold;
}
-
+
.mat-select-arrow {
color: var(--vitamui-primary);
}
@@ -24,8 +24,8 @@
}
mat-form-field {
- border: 1px solid $light-grey;
- background-color: $white;
+ border: 1px solid var(--vitamui-grey-300);
+ background-color: white;
padding-left: 25px;
padding-right: 25px;
border-radius: 50px;
@@ -35,12 +35,13 @@
}
.mat-form-field-flex {
- background-color: $white;
+ background-color: white;
padding: 0!important;
}
mat-select {
- color: $dark-grey!important;
+ color: var(--vitamui-grey-900);
+ font-size: 16px;
}
.mat-form-field-infix {
@@ -54,4 +55,4 @@
span.mat-select-placeholder {
margin-top: 0.4rem;
}
-}
\ No newline at end of file
+}
diff --git a/ui/ui-frontend-common/src/app/modules/components/vitamui-body/vitamui-body.component.scss b/ui/ui-frontend-common/src/app/modules/components/vitamui-body/vitamui-body.component.scss
index 0a4f299e3..7caa94425 100644
--- a/ui/ui-frontend-common/src/app/modules/components/vitamui-body/vitamui-body.component.scss
+++ b/ui/ui-frontend-common/src/app/modules/components/vitamui-body/vitamui-body.component.scss
@@ -2,32 +2,4 @@ div {
padding-top: 72px;
min-height: calc(100vh - 100px);
background-color: var(--vitamui-background);
- /* position: relative; */
- // width: 70%;
- // margin: 6rem auto;
-}
-/*
-@media screen and (min-width: 1501px) and (max-width: 1750px) {
- div {
- width: 75%;
- }
-}
-
-@media screen and (min-width: 1301px) and (max-width: 1500px) {
- div {
- width: 83%;
- }
-}
-
-@media screen and (max-width: 1300px) {
- div {
- width: 94%;
- }
-}
-
-@media screen and (max-width: 500px) {
- div {
- width: 98%;
- }
-}
-*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/ui/ui-frontend-common/src/app/modules/components/vitamui-input/vitamui-textarea.component.scss b/ui/ui-frontend-common/src/app/modules/components/vitamui-input/vitamui-textarea.component.scss
index 37de10434..0468ed565 100644
--- a/ui/ui-frontend-common/src/app/modules/components/vitamui-input/vitamui-textarea.component.scss
+++ b/ui/ui-frontend-common/src/app/modules/components/vitamui-input/vitamui-textarea.component.scss
@@ -54,7 +54,8 @@ $anim-timing: 150ms ease-out;
}
.vitamui-textarea.disabled {
- opacity: 0.4;
+ border: none;
+ background-color: var(--vitamui-grey-300);
}
:host.ng-pending {
@@ -81,7 +82,7 @@ textarea {
}
label {
- color: $greyish-two;
+ color: var(--vitamui-grey-600);
font-size: 15px;
position: absolute;
line-height: 48px;
diff --git a/ui/ui-frontend-common/src/sass/_editable-field.scss b/ui/ui-frontend-common/src/sass/_editable-field.scss
index c9b939d6f..20eb9e2d5 100644
--- a/ui/ui-frontend-common/src/sass/_editable-field.scss
+++ b/ui/ui-frontend-common/src/sass/_editable-field.scss
@@ -68,7 +68,7 @@ $anim-timing: 150ms ease-out;
}
.editable-field-text-content {
- margin-top: 17px;
+ margin-top: 16px;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
diff --git a/ui/ui-frontend-common/src/sass/_sidepanel.scss b/ui/ui-frontend-common/src/sass/_sidepanel.scss
index 00c3e5d89..aae517f03 100644
--- a/ui/ui-frontend-common/src/sass/_sidepanel.scss
+++ b/ui/ui-frontend-common/src/sass/_sidepanel.scss
@@ -1,5 +1,5 @@
.vitamui-sidepanel {
- min-width: 584px;
+ width: 584px;
height: 100vh;
background: white;
}
@@ -37,7 +37,6 @@
display: flex;
align-items: center;
margin-top: 30px;
- margin-bottom: 20px;
padding: 0 30px;
i {
@@ -64,9 +63,11 @@
font-size: 24px;
line-height: 24px;
font-weight: 700;
- margin-top: 32px;
margin: 0;
- text-transform: uppercase;
+ display: -webkit-box;
+ overflow: hidden;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
small {
display: block;
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html
index 34c4344a9..8873558a1 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer.component.html
@@ -12,7 +12,7 @@
<vitamui-common-banner [searchbarPlaceholder]="'Nom, raison sociale, code client, adresse...'" [disableSearchBar]="true">
<button class="btn primary ml-5" (click)="openCreateCustomerDialog()">
- <span>Créer un client</span>
+ <span>Créer un Client</span>
</button>
</vitamui-common-banner>
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/owner-preview/owner-preview.component.html b/ui/ui-frontend/projects/identity/src/app/customer/owner-preview/owner-preview.component.html
index 33bcf86c3..c823efe16 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/owner-preview/owner-preview.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/owner-preview/owner-preview.component.html
@@ -1,8 +1,8 @@
<div class="vitamui-sidepanel">
<div class="vitamui-sidepanel-header">
<div class="d-flex justify-content-between">
- <button *ngIf="!isPopup" class="btn btn-circle secondary large" role="button" (click)="openPopup()"><i class="vitamui-icon vitamui-icon-pin"></i></button>
- <button class="btn btn-circle secondary large" role="button" (click)="emitClose()"><i class="material-icons">close</i></button>
+ <button *ngIf="!isPopup" class="btn btn-circle primary large" role="button" (click)="openPopup()"><i class="vitamui-icon vitamui-icon-pin"></i></button>
+ <button class="btn btn-circle primary large" role="button" (click)="emitClose()"><i class="material-icons">close</i></button>
</div>
<div class="title">
diff --git a/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html b/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html
index e8c5c3dc2..9552034d3 100644
--- a/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/shared/domains-input/domains-input.component.html
@@ -1,4 +1,4 @@
-<div class="domain-input-control d-flex justify-content-between align-items-center">
+<div class="domain-input-control d-flex align-items-center">
<div class="domain-input-wrapper d-flex align-items-center">
<span class="mr-2">@</span>
<input class="vitamui-input" [style.width.px]="300" type="text" size="10" [formControl]="control" [attr.placeholder]="placeholder" (blur)="onTouched()" (keydown.enter)="add()">
@@ -6,9 +6,8 @@
</div>
<div class="actions">
- <button class="btn btn-circle secondary" (click)="add()" [disabled]="buttonAddDisabled()">
- <i class="vitamui-icon vitamui-icon-add"></i>
- </button>
+ <button type="button" class="btn primary ml-2" i18n="@@domainInputCreateNextButton" (click)="add()" [disabled]="buttonAddDisabled()">Ajouter</button>
+
</div>
</div>
--
GitLab