From 8c70f67d0763e1de33c5a0a61ccc03af34fb4834 Mon Sep 17 00:00:00 2001
From: Fadil <Fadil.zemmari@xelians.fr>
Date: Mon, 9 Nov 2020 12:19:16 +0100
Subject: [PATCH] [US TRTL-481 TRTL-482] Fix read-only-field display + small
fixes
---
.../editable-input/editable-input.component.html | 2 +-
.../editable-level-input.component.html | 2 +-
.../editable-select/editable-select.component.html | 2 +-
.../editable-textarea.component.html | 2 +-
.../editable-toggle-group.component.html | 2 +-
.../select-tenant/select-tenant.component.scss | 1 +
ui/ui-frontend-common/src/sass/_editable-field.scss | 4 ----
ui/ui-frontend-common/src/sass/_form.scss | 12 +++++++-----
ui/ui-frontend-common/src/sass/_search-bar.scss | 5 +++++
.../customer-list/customer-list.component.html | 10 ++++++----
.../information-tab/information-tab.component.scss | 10 ----------
11 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-input/editable-input.component.html b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-input/editable-input.component.html
index 02a3fd192..89a66e972 100644
--- a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-input/editable-input.component.html
+++ b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-input/editable-input.component.html
@@ -34,7 +34,7 @@
</div>
-<div *ngIf="disabled" class="read-only-field disabled-input">
+<div *ngIf="disabled" class="read-only-field">
<label>{{label}}</label>
<div class="value-display">{{control?.value}}</div>
</div>
\ No newline at end of file
diff --git a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-level-input/editable-level-input.component.html b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-level-input/editable-level-input.component.html
index 5cd12bf8c..5e4178193 100644
--- a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-level-input/editable-level-input.component.html
+++ b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-level-input/editable-level-input.component.html
@@ -25,7 +25,7 @@
</ng-template>
</ng-container>
-<div *ngIf="disabled" class="read-only-field disabled-input">
+<div *ngIf="disabled" class="read-only-field">
<div>
<label i18n="Admin profile level@@subLevel">Sous niveau</label>
<div> <span>{{control.value | subLevel:prefix }}</span></div>
diff --git a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-select/editable-select.component.html b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-select/editable-select.component.html
index d8347859f..d310ae5b0 100644
--- a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-select/editable-select.component.html
+++ b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-select/editable-select.component.html
@@ -39,7 +39,7 @@
</div>
-<div *ngIf="disabled" class="read-only-field disabled-input">
+<div *ngIf="disabled" class="read-only-field">
<label>{{label}}</label>
<div>{{content(control?.value)}}</div>
</div>
diff --git a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-textarea/editable-textarea.component.html b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-textarea/editable-textarea.component.html
index 1192e7552..daab80ef6 100644
--- a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-textarea/editable-textarea.component.html
+++ b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-textarea/editable-textarea.component.html
@@ -33,7 +33,7 @@
</div>
-<div *ngIf="disabled" class="read-only-field disabled-input squarish">
+<div *ngIf="disabled" class="read-only-field squarish">
<label>{{label}}</label>
<div>{{control?.value}}</div>
</div>
diff --git a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-toggle-group/editable-toggle-group.component.html b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-toggle-group/editable-toggle-group.component.html
index 01d3aa2fc..12f13e1b6 100644
--- a/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-toggle-group/editable-toggle-group.component.html
+++ b/ui/ui-frontend-common/src/app/modules/components/editable-field/editable-toggle-group/editable-toggle-group.component.html
@@ -33,7 +33,7 @@
</div>
-<div *ngIf="disabled" class="read-only-field disabled-input">
+<div *ngIf="disabled" class="read-only-field">
<label>{{label}}</label>
<div>{{content(control?.value)}}</div>
</div>
diff --git a/ui/ui-frontend-common/src/app/modules/components/header/select-tenant/select-tenant.component.scss b/ui/ui-frontend-common/src/app/modules/components/header/select-tenant/select-tenant.component.scss
index d84304d1d..4c8d6e5b2 100644
--- a/ui/ui-frontend-common/src/app/modules/components/header/select-tenant/select-tenant.component.scss
+++ b/ui/ui-frontend-common/src/app/modules/components/header/select-tenant/select-tenant.component.scss
@@ -40,6 +40,7 @@
mat-select {
color: var(--vitamui-grey-900);
+ font-size: 16px;
}
.mat-form-field-infix {
diff --git a/ui/ui-frontend-common/src/sass/_editable-field.scss b/ui/ui-frontend-common/src/sass/_editable-field.scss
index 2511260c1..5f9d60f5d 100644
--- a/ui/ui-frontend-common/src/sass/_editable-field.scss
+++ b/ui/ui-frontend-common/src/sass/_editable-field.scss
@@ -174,10 +174,6 @@ $anim-timing: 150ms ease-out;
border-radius: 10px;
}
-.disabled-input {
- background-color: var(--vitamui-grey-300);
-}
-
.squarish {
border-radius: 10px!important;
}
\ No newline at end of file
diff --git a/ui/ui-frontend-common/src/sass/_form.scss b/ui/ui-frontend-common/src/sass/_form.scss
index be4edd135..e68f9ae58 100644
--- a/ui/ui-frontend-common/src/sass/_form.scss
+++ b/ui/ui-frontend-common/src/sass/_form.scss
@@ -1,17 +1,19 @@
.read-only-field {
- border: 1px solid var(--vitamui-grey-300);
- border-radius: $input-height / 2;
display: inline-block;
min-height: 50px;
width: 100%;
- padding: 7px 20px 7px 25px;
+ padding: 7px;
vertical-align: top;
margin-bottom: 20px;
label {
font-size: 13px;
- color: var(--vitamui-grey-800);
- font-weight: normal;
+ color: var(--vitamui-grey-600);
+ font-weight: 500;
+ }
+
+ div {
+ font-weight: 500;
}
}
diff --git a/ui/ui-frontend-common/src/sass/_search-bar.scss b/ui/ui-frontend-common/src/sass/_search-bar.scss
index 4f10e77a7..67f390e9c 100644
--- a/ui/ui-frontend-common/src/sass/_search-bar.scss
+++ b/ui/ui-frontend-common/src/sass/_search-bar.scss
@@ -26,6 +26,11 @@
@include vitamui-input-placeholder;
font-weight: normal;
}
+
+ &:disabled {
+ background-color: var(--vitamui-grey-200);
+ cursor: not-allowed;
+ }
}
> button[type=submit].btn-search, > button[type=button].btn-search {
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html
index 9153b1e3a..948a31432 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer-list/customer-list.component.html
@@ -16,10 +16,12 @@
<i class="vitamui-icon vitamui-icon-bank" [style.fontSize.px]="30"></i>
<i class="material-icons caret ml-1" [style.fontSize.px]="20" [@arrow]="row2.state">keyboard_arrow_up</i>
</div>
- <div class="col-2"(click)="customerClick.emit(customer)">{{ customer?.code }}</div>
- <div class="col-2"(click)="customerClick.emit(customer)">{{ customer?.name }}</div>
- <div class="col-3"(click)="customerClick.emit(customer)">{{ customer?.companyName }}</div>
- <div class="col-2"(click)="customerClick.emit(customer)">{{ customer?.idp ? 'Oui' : 'Non'}}</div>
+ <div (click)="customerClick.emit(customer)" [style.display]="'contents'">
+ <div class="col-2">{{ customer?.code }}</div>
+ <div class="col-2">{{ customer?.name }}</div>
+ <div class="col-3">{{ customer?.companyName }}</div>
+ <div class="col-2">{{ customer?.idp ? 'Oui' : 'Non'}}</div>
+ </div>
<div class="col-2 actions">
<span (click)="customerClick.emit(customer)">{ customer?.otp, select, DISABLED {Non} OPTIONAL {Optionnelle} MANDATORY {Obligatoire} }</span>
<div>
diff --git a/ui/ui-frontend/projects/identity/src/app/group/group-preview/information-tab/information-tab.component.scss b/ui/ui-frontend/projects/identity/src/app/group/group-preview/information-tab/information-tab.component.scss
index ba44ee3fc..e69de29bb 100644
--- a/ui/ui-frontend/projects/identity/src/app/group/group-preview/information-tab/information-tab.component.scss
+++ b/ui/ui-frontend/projects/identity/src/app/group/group-preview/information-tab/information-tab.component.scss
@@ -1,10 +0,0 @@
-@import '~ui-frontend-common/sass/variables/colors';
-
-label {
- color: $greyish-two;
- font-size: 15px;
-}
-
-.level-input-div {
- margin-left: 20px;
-}
--
GitLab