From 57dd24ca19ac0e404c38b0d047aa7c4b310f548c Mon Sep 17 00:00:00 2001 From: Klaus Quibeldey-Cirkel <klaus-dieter.quibeldey-cirkel@mni.thm.de> Date: Sun, 8 Aug 2021 11:52:00 +0200 Subject: [PATCH] styling --- .../dialog-action-buttons.component.html | 10 +++++++--- .../shared/header/header.component.scss | 19 ++++++++++--------- .../active-user/active-user.component.scss | 4 ++-- src/app/utils/cloud-parameters.ts | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html index 8dab567c3..fc72dc98d 100644 --- a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html +++ b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html @@ -2,9 +2,10 @@ 'dialog-action-buttons': true, 'no-spacing': (spacing === false) }"> - <mat-divider *ngIf="showDivider"></mat-divider> <div fxLayoutAlign="end"> - <div fxLayout="row-reverse" fxLayoutGap="10px" class="buttons"> + <div fxLayout="row-reverse" + fxLayoutGap="10px" + class="buttons"> <button [disabled]="confirmButtonDisabled" *ngIf="confirmButtonClickAction !== undefined" @@ -13,7 +14,10 @@ class="mat-flat-button {{ confirmButtonType }}-confirm-button" attr.aria-labelledby="{{ ariaPrefix + 'confirm' | translate }}" (click)="performConfirmButtonClickAction()" - ><mat-icon *ngIf="buttonIcon" style="margin-right: 5px;">{{buttonIcon}}</mat-icon>{{ buttonsLabelSection + '.' + confirmButtonLabel | translate}} + > + <mat-icon *ngIf="buttonIcon" + style="margin-right: 5px;">{{buttonIcon}}</mat-icon> + {{ buttonsLabelSection + '.' + confirmButtonLabel | translate}} <mat-icon *ngIf="showLoadingCycle"> <mat-spinner diameter="20"></mat-spinner> </mat-icon> diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss index 1b5157c73..b328bb46a 100644 --- a/src/app/components/shared/header/header.component.scss +++ b/src/app/components/shared/header/header.component.scss @@ -170,12 +170,12 @@ h1 { background-color: var(--on-dialog) !important; } -.userActivityIcon{ - width:25px; - height:25px; - margin-left:25px; - margin-bottom:5px; - background-color:var(--on-background); +.userActivityIcon { + width: 25px; + height: 25px; + margin-left: 25px; + margin-bottom: 5px; + background-color: var(--primary); -webkit-mask-image: url("../../../../assets/icons/activity.svg"); mask-image: url("../../../../assets/icons/activity.svg"); mask-repeat: no-repeat; @@ -183,7 +183,8 @@ h1 { mask-size: 100% 100%; } -.userActivityTxt{ - color:var(--on-background); - margin-left:15px; +.userActivityTxt { + color: var(--primary); + margin-left: 5px; + font-size: 14px; } diff --git a/src/app/components/shared/overlay/active-user/active-user.component.scss b/src/app/components/shared/overlay/active-user/active-user.component.scss index 670fae609..e1924c645 100644 --- a/src/app/components/shared/overlay/active-user/active-user.component.scss +++ b/src/app/components/shared/overlay/active-user/active-user.component.scss @@ -19,7 +19,7 @@ box-shadow: none !important; right: -75px; background-color: transparent !important; - color: var(--green) !important; + color: var(--primary) !important; animation:popin-shadow 0.4s cubic-bezier(0.680, -0.550, 0.265, 1.550) both; } } @@ -27,7 +27,7 @@ width: 100%; height: 100%; position: absolute; - background-color:var(--green) !important; + background-color:var(--primary) !important; -webkit-mask-image: url("../../../../../assets/icons/activity.svg"); mask-image: url("../../../../../assets/icons/activity.svg"); mask-repeat: no-repeat; diff --git a/src/app/utils/cloud-parameters.ts b/src/app/utils/cloud-parameters.ts index f9dcd2e9a..54c245000 100644 --- a/src/app/utils/cloud-parameters.ts +++ b/src/app/utils/cloud-parameters.ts @@ -123,7 +123,7 @@ export class CloudParameters { this.question = ''; this.textTransform = CloudTextStyle.capitalized; this.cloudWeightSettings = [ - { maxVisibleElements: elements, color: '#c1c1c1', rotation: 0, allowManualTagNumber: true }, + { maxVisibleElements: elements, color: '#C0C0C0', rotation: 0, allowManualTagNumber: true }, { maxVisibleElements: elements, color: '#d98e49', rotation: 0, allowManualTagNumber: true }, { maxVisibleElements: elements, color: '#ccca3c', rotation: 0, allowManualTagNumber: true }, { maxVisibleElements: elements, color: '#83e761', rotation: 0, allowManualTagNumber: true }, -- GitLab