From 3c5da169b2baf56961e10551304accec4851ba5f Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 23 Jul 2021 12:09:55 +0100 Subject: [PATCH] Theme bugfixes (#7186) * fix core bugs * use proper pallettes --- .../src/lib/breadcrumb/breadcrumb.theme.scss | 2 +- .../card-view-textitem/card-view-textitem.theme.scss | 4 +++- .../datatable/components/datatable/datatable.theme.scss | 7 ++++--- lib/core/styles/_index.scss | 2 +- lib/core/viewer/components/img-viewer.theme.scss | 3 ++- .../viewer/components/pdf-viewer-thumbnails.theme.scss | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.theme.scss b/lib/content-services/src/lib/breadcrumb/breadcrumb.theme.scss index ca5f36492c..de453c004b 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.theme.scss +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.theme.scss @@ -5,7 +5,7 @@ $foreground: map-get($theme, foreground); $breadcrumb-chevron-spacer: 2px; - $breadcrumb-outline: 1px solid mat-color($alfresco-ecm-blue, A200) !default; + $breadcrumb-outline: 1px solid mat-color($accent, A200) !default; .adf-breadcrumb { display: flex; diff --git a/lib/core/card-view/components/card-view-textitem/card-view-textitem.theme.scss b/lib/core/card-view/components/card-view-textitem/card-view-textitem.theme.scss index cd2e49d057..526845656d 100644 --- a/lib/core/card-view/components/card-view-textitem/card-view-textitem.theme.scss +++ b/lib/core/card-view/components/card-view-textitem/card-view-textitem.theme.scss @@ -1,6 +1,8 @@ @mixin adf-card-view-textitem-theme($theme) { + $primary: map-get($theme, primary); + $accent: map-get($theme, accent); $foreground: map-get($theme, foreground); - $outline: 1px solid mat-color($alfresco-ecm-blue, A200) !default; + $outline: 1px solid mat-color($accent, A200) !default; .adf { &-textitem-edit-icon.mat-icon { diff --git a/lib/core/datatable/components/datatable/datatable.theme.scss b/lib/core/datatable/components/datatable/datatable.theme.scss index 4ecf720bd6..28abad2865 100644 --- a/lib/core/datatable/components/datatable/datatable.theme.scss +++ b/lib/core/datatable/components/datatable/datatable.theme.scss @@ -2,6 +2,7 @@ $foreground: map-get($theme, foreground); $background: map-get($theme, background); $primary: map-get($theme, primary); + $accent: map-get($theme, accent); $data-table-font-size: 14px !default; $data-table-header-font-size: 12px !default; @@ -11,8 +12,8 @@ $data-table-header-sorted-icon-hover-color: mat-color($foreground, disabled-text) !default; $data-table-cell-text-color: mat-color($foreground, text) !default; $data-table-cell-link-color: mat-color($foreground, text) !default; - $data-table-cell-link-hover-color: mat-color($alfresco-ecm-blue, 500) !default; - $data-table-outline: 1px solid mat-color($alfresco-ecm-blue, A200) !default; + $data-table-cell-link-hover-color: mat-color($accent, 500) !default; + $data-table-outline: 1px solid mat-color($accent, A200) !default; $data-table-divider-color: mat-color($foreground, text, 0.07) !default; $data-table-hover-color: mat-color($background, 'hover') !default; $data-table-selection-color: mat-color($background, 'selected-button') !default; @@ -24,7 +25,7 @@ $data-table-column-padding: $data-table-column-spacing / 2; $data-table-card-padding: 24px !default; $data-table-cell-top: $data-table-card-padding / 2; - $data-table-drag-border: 1px dashed mat-color($alfresco-ecm-blue, A200); + $data-table-drag-border: 1px dashed mat-color($accent, A200); $data-table-thumbnail-width: 50px !default; $data-table-cell-min-width: 50px !default; $data-table-cell-min-width--no-grow: 100px !default; diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss index d446801613..b3179ca28c 100644 --- a/lib/core/styles/_index.scss +++ b/lib/core/styles/_index.scss @@ -32,7 +32,7 @@ @import '../templates/empty-content/empty-content.theme'; @import '../templates/error-content/error-content.theme'; @import '../clipboard/clipboard.theme'; -@import '../../core/search-text/search-text-input.theme'; +@import '../search-text/search-text-input.theme'; @import './snackbar.theme'; @import '../directives/tooltip-card/tooltip-card.theme'; @import '../notifications/components/notification-history.theme'; diff --git a/lib/core/viewer/components/img-viewer.theme.scss b/lib/core/viewer/components/img-viewer.theme.scss index e702b6b5e6..a8826c33eb 100644 --- a/lib/core/viewer/components/img-viewer.theme.scss +++ b/lib/core/viewer/components/img-viewer.theme.scss @@ -1,6 +1,7 @@ @mixin adf-image-viewer-theme($theme) { + $accent: map-get($theme, accent); $background: map-get($theme, background); - $viewer-image-outline: 1px solid mat-color($alfresco-ecm-blue, A200) !default; + $viewer-image-outline: 1px solid mat-color($accent, A200) !default; .adf-image-viewer { width: 100%; diff --git a/lib/core/viewer/components/pdf-viewer-thumbnails.theme.scss b/lib/core/viewer/components/pdf-viewer-thumbnails.theme.scss index e54d18c5ff..696bd589d0 100644 --- a/lib/core/viewer/components/pdf-viewer-thumbnails.theme.scss +++ b/lib/core/viewer/components/pdf-viewer-thumbnails.theme.scss @@ -1,4 +1,5 @@ @mixin adf-pdf-thumbnails-theme($theme) { + $accent: map-get($theme, accent); $background: map-get($theme, background); .adf-pdf-thumbnails { @@ -28,7 +29,7 @@ } &__thumb--selected { - border: 2px solid mat-color($alfresco-ecm-blue, A200); + border: 2px solid mat-color($accent, A200); } } }