From cf1a4482cb3f3964051823984f75a152a9cb0899 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 26 Mar 2020 16:59:36 +0200 Subject: [PATCH] UI: Theme improvement --- ui-ngx/src/theme.scss | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/ui-ngx/src/theme.scss b/ui-ngx/src/theme.scss index bf61c4e208..6907d6c29d 100644 --- a/ui-ngx/src/theme.scss +++ b/ui-ngx/src/theme.scss @@ -61,41 +61,17 @@ $tb-mat-indigo: ( $tb-primary: mat-palette($tb-mat-indigo); $tb-accent: mat-palette($mat-deep-orange); -// Background palette for light themes. -$tb-light-theme-background: ( - status-bar: map_get($mat-grey, 300), - app-bar: map_get($mat-grey, 100), - background: #eee, // map_get($mat-grey, 50), - hover: rgba(black, 0.04), - card: white, - dialog: white, - disabled-button: rgba(black, 0.12), - raised-button: white, - focused-button: $dark-focused, - selected-button: map_get($mat-grey, 300), - selected-disabled-button: map_get($mat-grey, 400), - disabled-button-toggle: map_get($mat-grey, 200), - unselected-chip: map_get($mat-grey, 300), - disabled-list-option: map_get($mat-grey, 200), - tooltip: map_get($mat-grey, 700) -); +$background: (background: map_get($mat-grey, 200)); -@function get-tb-light-theme($primary, $accent, $warn: mat-palette($mat-red)) { - @return ( - primary: $primary, - accent: $accent, - warn: $warn, - is-dark: false, - foreground: $mat-light-theme-foreground, - background: $tb-light-theme-background, - ); -} +$tb-theme-background: map_merge($mat-light-theme-background, $background); -$tb-theme: get-tb-light-theme( +$tb-mat-theme: mat-light-theme( $tb-primary, $tb-accent ); +$tb-theme: map_merge($tb-mat-theme, (background: $tb-theme-background)); + $primary: mat-color($tb-primary); $accent: mat-color($tb-accent);