From b26991014cc220e5324ad7d159ca374078418ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Baptiste=20Mah=C3=A9?= Date: Mon, 30 Mar 2020 20:18:04 +0200 Subject: [PATCH] [ADF-5095] Update text color of share dialog (#5575) --- .../content-node-share.dialog.scss | 106 +++++++++--------- .../src/lib/styles/_index.scss | 6 +- 2 files changed, 59 insertions(+), 53 deletions(-) diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss index 41cd85d084..ed0a0509f4 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss @@ -1,71 +1,75 @@ -@mixin adf-share-link-typography { +@mixin adf-share-link-typography($foreground) { letter-spacing: -0.4px; line-height: 2; font-weight: normal; font-style: normal; font-stretch: normal; font-size: 16px; - opacity: 0.87; + color: mat-color($foreground, text, 0.87); } -.adf-float-label { - padding-top: 20px; -} -.adf-share-link-dialog { +@mixin adf-content-node-share-theme($theme) { + $foreground: map-get($theme, foreground); - .adf-share-link { - &__dialog-content { - display: flex; - flex-direction: column; + .adf-float-label { + padding-top: 20px; + } + .adf-share-link-dialog { + + .adf-share-link { + &__dialog-content { + display: flex; + flex-direction: column; + } + + &__label { + @include adf-share-link-typography($foreground); + flex: 1 1 auto; + } + + &__title { + @include adf-share-link-typography($foreground); + } + + &__info { + @include adf-share-link-typography($foreground); + color: mat-color($foreground, text, 0.54); + font-size: 13px; + } + + &--row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + } + + &__input { + color: mat-color($foreground, text, 0.87); + } } - &__label { - @include adf-share-link-typography; - flex: 1 1 auto; + .adf-input-action { + cursor: pointer; } - &__title { - @include adf-share-link-typography; + .adf-full-width { + width: 100%; } - &__info { - @include adf-share-link-typography; - opacity: 0.54; - font-size: 13px; + .mat-form-field-infix { + border-top: unset; } - &--row { - display: flex; - flex-direction: row; - flex-wrap: wrap; + .mat-dialog-actions { + justify-content: flex-end; + + & > button { + text-transform: uppercase; + } + } + + .mat-form-field-flex { align-items: center; } - - &__input { - opacity: 0.54; - } - } - - .adf-input-action { - cursor: pointer; - } - - .adf-full-width { - width: 100%; - } - - .mat-form-field-infix { - border-top: unset; - } - - .mat-dialog-actions { - justify-content: flex-end; - - & > button { - text-transform: uppercase; - } - } - - .mat-form-field-flex { - align-items: center; } } diff --git a/lib/content-services/src/lib/styles/_index.scss b/lib/content-services/src/lib/styles/_index.scss index 956468aea8..6573304c6b 100644 --- a/lib/content-services/src/lib/styles/_index.scss +++ b/lib/content-services/src/lib/styles/_index.scss @@ -17,6 +17,7 @@ @import '../dialogs/folder.dialog'; @import '../content-node-selector/content-node-selector.component'; +@import '../content-node-share/content-node-share.dialog'; @import '../content-metadata/content-metadata.module'; @import '../permission-manager/components/permission-list/permission-list.component'; @import '../permission-manager/components/add-permission/add-permission.component'; @@ -27,7 +28,8 @@ @mixin adf-content-services-theme($theme) { @include adf-breadcrumb-theme($theme); @include adf-breadcrumb-dropdown-theme($theme); - @include adf-content-node-selector-theme($theme) ; + @include adf-content-node-selector-theme($theme); + @include adf-content-node-share-theme($theme); @include adf-name-location-cell-theme($theme); @include adf-document-list-theme($theme) ; @include adf-file-uploading-row-theme($theme); @@ -37,7 +39,7 @@ @include adf-search-autocomplete-theme($theme); @include adf-search-sorting-picker-theme($theme); @include adf-dialog-theme($theme); - @include adf-content-node-selector-dialog-theme($theme) ; + @include adf-content-node-selector-dialog-theme($theme); @include adf-content-metadata-module-theme($theme); @include adf-permission-list-theme($theme); @include adf-add-permission-theme($theme);