From dbc2c6c8e4bc532952e197c58182a0e9493b1525 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 3 May 2019 16:04:44 +0100 Subject: [PATCH] [ACA-2147] minor theme fixes (#1096) --- .../content-node-share.dialog.scss | 14 -------------- src/app/ui/custom-theme.scss | 5 ++--- src/app/ui/overrides/adf-toolbar.theme.scss | 5 ----- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 src/app/ui/overrides/adf-toolbar.theme.scss diff --git a/src/app/components/shared/content-node-share/content-node-share.dialog.scss b/src/app/components/shared/content-node-share/content-node-share.dialog.scss index 2d71489f1..cfd380f8c 100644 --- a/src/app/components/shared/content-node-share/content-node-share.dialog.scss +++ b/src/app/components/shared/content-node-share/content-node-share.dialog.scss @@ -1,17 +1,3 @@ -@mixin aca-share-dialog-theme($theme) { - $accent: map-get($theme, accent); - - // fixes [ACA-2069] - .mat-slide-toggle.mat-primary.mat-checked:not(.mat-disabled) { - .mat-slide-toggle-thumb { - background-color: mat-color($accent); - } - .mat-slide-toggle-bar { - background-color: mat-color($accent, 0.54); - } - } -} - @mixin adf-share-link-typography { letter-spacing: -0.4px; line-height: 2; diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index e970dd835..b486030c1 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -13,7 +13,6 @@ @import '../components/layout/layout.theme.scss'; @import '../components/shared/content-node-share/content-node-share.dialog.scss'; -@import './overrides/adf-toolbar.theme'; @import 'overrides/adf-layout-container.theme'; @import './overrides/adf-document-list.theme'; @@ -62,7 +61,8 @@ $foreground: map-get($custom-theme, foreground); $warn: map-get($custom-theme, warn); @mixin custom-theme($theme) { - @include custom-adf-toolbar-theme($theme); + @include mat-button-theme($theme); + @include adf-document-list-theme($theme); @include layout-theme($theme); @@ -76,7 +76,6 @@ $warn: map-get($custom-theme, warn); @include aca-current-user-theme($theme); @include aca-context-menu-theme($theme); @include app-create-menu-theme($theme); - @include aca-share-dialog-theme($theme); } //Custom variables - ACA specific styling: diff --git a/src/app/ui/overrides/adf-toolbar.theme.scss b/src/app/ui/overrides/adf-toolbar.theme.scss deleted file mode 100644 index 85e16b214..000000000 --- a/src/app/ui/overrides/adf-toolbar.theme.scss +++ /dev/null @@ -1,5 +0,0 @@ -@mixin custom-adf-toolbar-theme($theme) { - .adf-toolbar { - @include angular-material-theme($theme); - } -}