From 41b53489cd0a298664c74b0ea75004f024d05fda Mon Sep 17 00:00:00 2001
From: Cindy <cindy.nacibide@teamdlab.com>
Date: Wed, 9 Dec 2020 16:24:34 +0100
Subject: [PATCH] [US TRTL-571] [FIX TRTL-486] rework mini/specific list
(tenant, pattern)
---
.../header/item-select/item-select.component.html | 4 ++--
ui/ui-frontend-common/src/sass/_editable-field.scss | 4 ++++
ui/ui-frontend-common/src/sass/_form.scss | 1 +
ui/ui-frontend-common/src/sass/_preview.scss | 1 +
ui/ui-frontend-common/src/sass/material/_select.scss | 6 ++++--
.../editable-patterns/editable-patterns.component.html | 4 ++--
.../projects/referential/src/sass/_sidepanel.scss | 1 +
.../starter-kit/src/app/components/inputs/inputs.module.ts | 5 ++---
8 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ui/ui-frontend-common/src/app/modules/components/header/item-select/item-select.component.html b/ui/ui-frontend-common/src/app/modules/components/header/item-select/item-select.component.html
index 66a58660b..33b72059a 100644
--- a/ui/ui-frontend-common/src/app/modules/components/header/item-select/item-select.component.html
+++ b/ui/ui-frontend-common/src/app/modules/components/header/item-select/item-select.component.html
@@ -1,7 +1,7 @@
-<mat-form-field appearance="fill">
+<mat-form-field>
<mat-label *ngIf="selectedItem" class="selected-item-label">{{label}}</mat-label>
<mat-label *ngIf="!selectedItem" class="unselected-item-label">{{selectedLabel}}</mat-label>
- <mat-select (selectionChange)="selectItem($event.source.value)" [(value)]="_selectedItem">
+ <mat-select (selectionChange)="selectItem($event.source.value)" [(value)]="_selectedItem" panelClass="vitamui-mat-select">
<mat-option *ngFor="let item of items" [value]="item.label">
{{ item.label }}
</mat-option>
diff --git a/ui/ui-frontend-common/src/sass/_editable-field.scss b/ui/ui-frontend-common/src/sass/_editable-field.scss
index 10a435441..8a8f3442f 100644
--- a/ui/ui-frontend-common/src/sass/_editable-field.scss
+++ b/ui/ui-frontend-common/src/sass/_editable-field.scss
@@ -51,6 +51,7 @@ $anim-timing: 150ms ease-out;
}
.editable-field-content {
+ font-family: 'Mulish', sans-serif;
display: flex;
flex-direction: column;
align-items: stretch;
@@ -59,6 +60,7 @@ $anim-timing: 150ms ease-out;
max-width: 100%;
.editable-field-label {
+ font-family: 'Mulish', sans-serif;
position: absolute;
font-size: 12px;
color: var(--vitamui-grey-400);
@@ -85,6 +87,7 @@ $anim-timing: 150ms ease-out;
}
.editable-field-control > input {
+ font-family: 'Mulish', sans-serif;
border: none!important;
margin-top: 5px;
@@ -94,6 +97,7 @@ $anim-timing: 150ms ease-out;
}
.editable-field-control > textarea {
+ font-family: 'Mulish', sans-serif;
border: none!important;
&:focus {
diff --git a/ui/ui-frontend-common/src/sass/_form.scss b/ui/ui-frontend-common/src/sass/_form.scss
index 3a2833a53..ba75c1b78 100644
--- a/ui/ui-frontend-common/src/sass/_form.scss
+++ b/ui/ui-frontend-common/src/sass/_form.scss
@@ -5,6 +5,7 @@
padding: 5px;
vertical-align: top;
margin-bottom: 10px;
+ font-family: 'Mulish', sans-serif;
label {
font-size: 12px;
diff --git a/ui/ui-frontend-common/src/sass/_preview.scss b/ui/ui-frontend-common/src/sass/_preview.scss
index ce823312f..1096724c8 100644
--- a/ui/ui-frontend-common/src/sass/_preview.scss
+++ b/ui/ui-frontend-common/src/sass/_preview.scss
@@ -111,6 +111,7 @@
margin-bottom: 20px;
label {
+ font-family: 'Mulish', sans-serif;
font-size: 12px;
color: var(--vitamui-grey-600);
font-weight: normal;
diff --git a/ui/ui-frontend-common/src/sass/material/_select.scss b/ui/ui-frontend-common/src/sass/material/_select.scss
index 337a4e480..c03231c5f 100644
--- a/ui/ui-frontend-common/src/sass/material/_select.scss
+++ b/ui/ui-frontend-common/src/sass/material/_select.scss
@@ -17,7 +17,9 @@
.mat-form-field-label {
color: var(--vitamui-grey-600);
}
+ }
+ &:not(.vitamui-mat-select-mini).mat-focused {
.mat-form-field-flex {
outline: none;
border: solid 1px var(--vitamui-primary) !important;
@@ -128,7 +130,7 @@
flex-direction: column;
margin-top: -8px;
- i{
+ i {
height: 10px;
font-size: 18px;
}
@@ -170,7 +172,7 @@
border: none;
&:hover {
- box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.1);
+ @include elevation-0;
}
}
diff --git a/ui/ui-frontend/projects/identity/src/app/shared/editable-field/editable-patterns/editable-patterns.component.html b/ui/ui-frontend/projects/identity/src/app/shared/editable-field/editable-patterns/editable-patterns.component.html
index f6f0c0ea5..07cc1d79e 100644
--- a/ui/ui-frontend/projects/identity/src/app/shared/editable-field/editable-patterns/editable-patterns.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/shared/editable-field/editable-patterns/editable-patterns.component.html
@@ -6,8 +6,8 @@
<span class="editable-field-text-content">
<div *ngFor="let pattern of control.value">{{pattern}}</div>
</span>
- <div class="editable-field-control">
- <app-pattern [style.width.%]="100" [vitamuiMiniMode]="true" [formControl]="control" [options]="options" (click)="onPatternClick()"></app-pattern>
+ <div class="mt-2 editable-field-control">
+ <app-pattern [style.width.%]="100" [formControl]="control" [options]="options" (click)="onPatternClick()"></app-pattern>
</div>
</div>
<i *ngIf="!showSpinner && !editMode" class="material-icons edit-icon">edit</i>
diff --git a/ui/ui-frontend/projects/referential/src/sass/_sidepanel.scss b/ui/ui-frontend/projects/referential/src/sass/_sidepanel.scss
index def7539ff..6574d237b 100644
--- a/ui/ui-frontend/projects/referential/src/sass/_sidepanel.scss
+++ b/ui/ui-frontend/projects/referential/src/sass/_sidepanel.scss
@@ -14,6 +14,7 @@
margin-bottom: 20px;
label {
+ font-family: 'Mulish', sans-serif;
font-size: 13px;
color: $greyish-two;
font-weight: normal;
diff --git a/ui/ui-frontend/projects/starter-kit/src/app/components/inputs/inputs.module.ts b/ui/ui-frontend/projects/starter-kit/src/app/components/inputs/inputs.module.ts
index cd929f3fb..72d5b4637 100644
--- a/ui/ui-frontend/projects/starter-kit/src/app/components/inputs/inputs.module.ts
+++ b/ui/ui-frontend/projects/starter-kit/src/app/components/inputs/inputs.module.ts
@@ -2,10 +2,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonToggleModule } from '@angular/material';
+import { MatSelectModule } from '@angular/material/select';
import { VitamUICommonModule } from 'ui-frontend-common';
import { InputsComponent } from './inputs.component';
-import { MatSelectModule } from '@angular/material/select';
-
@NgModule({
declarations: [InputsComponent],
@@ -14,7 +13,7 @@ import { MatSelectModule } from '@angular/material/select';
VitamUICommonModule,
ReactiveFormsModule,
MatSelectModule,
- MatButtonToggleModule,
+ MatButtonToggleModule
],
exports: [InputsComponent]
})
--
GitLab