Showing
1 changed file
with
5 additions
and
29 deletions
@@ -61,41 +61,17 @@ $tb-mat-indigo: ( | @@ -61,41 +61,17 @@ $tb-mat-indigo: ( | ||
61 | $tb-primary: mat-palette($tb-mat-indigo); | 61 | $tb-primary: mat-palette($tb-mat-indigo); |
62 | $tb-accent: mat-palette($mat-deep-orange); | 62 | $tb-accent: mat-palette($mat-deep-orange); |
63 | 63 | ||
64 | -// Background palette for light themes. | ||
65 | -$tb-light-theme-background: ( | ||
66 | - status-bar: map_get($mat-grey, 300), | ||
67 | - app-bar: map_get($mat-grey, 100), | ||
68 | - background: #eee, // map_get($mat-grey, 50), | ||
69 | - hover: rgba(black, 0.04), | ||
70 | - card: white, | ||
71 | - dialog: white, | ||
72 | - disabled-button: rgba(black, 0.12), | ||
73 | - raised-button: white, | ||
74 | - focused-button: $dark-focused, | ||
75 | - selected-button: map_get($mat-grey, 300), | ||
76 | - selected-disabled-button: map_get($mat-grey, 400), | ||
77 | - disabled-button-toggle: map_get($mat-grey, 200), | ||
78 | - unselected-chip: map_get($mat-grey, 300), | ||
79 | - disabled-list-option: map_get($mat-grey, 200), | ||
80 | - tooltip: map_get($mat-grey, 700) | ||
81 | -); | 64 | +$background: (background: map_get($mat-grey, 200)); |
82 | 65 | ||
83 | -@function get-tb-light-theme($primary, $accent, $warn: mat-palette($mat-red)) { | ||
84 | - @return ( | ||
85 | - primary: $primary, | ||
86 | - accent: $accent, | ||
87 | - warn: $warn, | ||
88 | - is-dark: false, | ||
89 | - foreground: $mat-light-theme-foreground, | ||
90 | - background: $tb-light-theme-background, | ||
91 | - ); | ||
92 | -} | 66 | +$tb-theme-background: map_merge($mat-light-theme-background, $background); |
93 | 67 | ||
94 | -$tb-theme: get-tb-light-theme( | 68 | +$tb-mat-theme: mat-light-theme( |
95 | $tb-primary, | 69 | $tb-primary, |
96 | $tb-accent | 70 | $tb-accent |
97 | ); | 71 | ); |
98 | 72 | ||
73 | +$tb-theme: map_merge($tb-mat-theme, (background: $tb-theme-background)); | ||
74 | + | ||
99 | $primary: mat-color($tb-primary); | 75 | $primary: mat-color($tb-primary); |
100 | $accent: mat-color($tb-accent); | 76 | $accent: mat-color($tb-accent); |
101 | 77 |