Skip to content

Commit acde309

Browse files
lucaaslucaas
committed
Add default statements to color variables
This is necessary for them to be configurable via toolbox-loader
1 parent 7dfa13f commit acde309

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

‎components/autocomplete/_config.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
$autocomplete-color-primary-contrast: $color-primary-contrast;
2-
$autocomplete-color-primary: $color-primary;
1+
$autocomplete-color-primary-contrast: $color-primary-contrast !default;
2+
$autocomplete-color-primary: $color-primary !default;
33
$autocomplete-overflow-max-height: 45vh;
4-
$autocomplete-suggestion-active-background: $palette-grey-200;
4+
$autocomplete-suggestion-active-background: $palette-grey-200 !default;
55
$autocomplete-suggestion-padding: $unit;
6-
$autocomplete-suggestions-background: $color-white;
6+
$autocomplete-suggestions-background: $color-white !default;
77
$autocomplete-value-border-radius: .2 * $unit;
88
$autocomplete-value-margin: $unit * .25 $unit * .5 $unit * .25 0;
99
$autocomplete-value-padding: $unit * .5 $unit * .75;

‎components/card/_config.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$card-color-white: $color-white !default;
22
$card-text-overlay: rgba($color-black, 0.35) !default;
3-
$card-background-color: $card-color-white;
3+
$card-background-color: $card-color-white !default;
44
$card-padding-sm: .8 * $unit;
55
$card-padding: 1.6 * $unit;
66
$card-padding-lg: 2 * $unit;

‎components/date_picker/_config.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$datepicker-primary: $color-primary;
2-
$datepicker-primary-contrast: $color-primary-contrast;
3-
$datepicker-primary-dark: $color-primary-dark;
1+
$datepicker-primary: $color-primary !default;
2+
$datepicker-primary-contrast: $color-primary-contrast !default;
3+
$datepicker-primary-dark: $color-primary-dark !default;
44
$datepicker-primary-color: $datepicker-primary !default;
55
$datepicker-primary-hover-color: rgba($datepicker-primary, 0.20) !default;
66
$datepicker-primary-contrast-color: $datepicker-primary-contrast !default;
@@ -14,8 +14,8 @@ $datepicker-day-font-size: 5 * $unit;
1414
$datepicker-day-line-height: 4 * $unit;
1515
$datepicker-year-font-size: $font-size-small;
1616

17-
$calendar-primary: $color-primary;
18-
$calendar-primary-contrast: $color-primary-contrast;
17+
$calendar-primary: $color-primary !default;
18+
$calendar-primary-contrast: $color-primary-contrast !default;
1919
$calendar-primary-color: $calendar-primary !default;
2020
$calendar-primary-contrast-color: $calendar-primary-contrast !default;
2121
$calendar-primary-hover-color: rgba($calendar-primary, 0.21) !default;

‎components/dropdown/_config.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$dropdown-color-white: $color-white;
2-
$dropdown-color-primary: $color-primary;
3-
$dropdown-color-primary-contrast: $color-primary-contrast;
4-
$dropdown-value-hover-background: $palette-grey-200;
1+
$dropdown-color-white: $color-white !default;
2+
$dropdown-color-primary: $color-primary !default;
3+
$dropdown-color-primary-contrast: $color-primary-contrast !default;
4+
$dropdown-value-hover-background: $palette-grey-200 !default;
55
$dropdown-overflow-max-height: 45vh;
66
$dropdown-value-border-radius: .2 * $unit;

‎components/list/_config.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $list-subheader-font-weight: 500;
77
$list-divider-height: .1 * $unit;
88
$list-item-min-height: 4.8 * $unit;
99
$list-item-min-height-legend: 7.2 * $unit;
10-
$list-item-hover-color: $palette-grey-200;
10+
$list-item-hover-color: $palette-grey-200 !default;
1111
$list-item-legend-margin-top: .3 * $unit;
1212
$list-item-icon-font-size: 2.4 * $unit;
1313
$list-item-icon-size: 1.8 * $unit;

‎components/menu/_config.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
$menu-expand-duration: .3s !default;
22
$menu-fade-duration: .2s !default;
33
$menu-ripple-delay: .3s !default;
4-
$menu-background-color: $color-white;
4+
$menu-background-color: $color-white !default;
55
$menu-padding: .8 * $unit 0;
66
$menu-outline-border-radius: .2 * $unit;
7-
$menu-item-hover-background: $palette-grey-200;
7+
$menu-item-hover-background: $palette-grey-200 !default;
88
$menu-item-selected-background: transparent !default;
99
$menu-item-icon-font-size: 2.4 * $unit;
1010
$menu-item-icon-size: 1.6 * $menu-item-icon-font-size;

‎components/table/_config.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$table-row-height: 48px;
2-
$table-row-divider: solid 1px rgba(0,0,0,.12);
2+
$table-row-divider: solid 1px rgba(0,0,0,.12) !default;
33
$table-row-offset: 1.8 * $unit;
4-
$table-row-highlight: #eee;
5-
$table-text-color: #757575;
4+
$table-row-highlight: #eee !default;
5+
$table-text-color: #757575 !default;

‎components/tabs/_config.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $tab-label-h-padding: 1.2 * $unit;
33
$tab-label-height: 4.8 * $unit;
44
$tab-text-height: 1.4 * $unit;
55
$tab-label-v-padding: ($tab-label-height - $tab-text-height) / 2;
6-
$tab-navigation-border-color: $color-divider;
6+
$tab-navigation-border-color: $color-divider !default;
77
$tab-pointer-color: $color-primary !default;
88
$tab-pointer-height: .2 * $unit;
99
$tab-text: $color-black !default;

‎components/time_picker/_config.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
$timepicker-header-font-size: 5.2 * $unit;
22
$timepicker-header-padding: $unit;
33
$timepicker-ampm-font-size: 1.6 * $unit;
4-
$timepicker-primary: $color-primary;
5-
$timepicker-primary-contrast: $color-primary-contrast;
6-
$timepicker-primary-dark: $color-primary-dark;
4+
$timepicker-primary: $color-primary !default;
5+
$timepicker-primary-contrast: $color-primary-contrast !default;
6+
$timepicker-primary-dark: $color-primary-dark !default;
77
$timepicker-primary-color: $timepicker-primary !default;
88
$timepicker-primary-hover-color: rgba($timepicker-primary, 0.20) !default;
99
$timepicker-primary-contrast-color: $timepicker-primary-contrast !default;
@@ -13,9 +13,9 @@ $timepicker-ampm-width: 4 * $unit;
1313
$timepicker-dialog-width: 30 * $unit;
1414

1515
$clock-padding: 1.5 * $unit 2 * $unit;
16-
$clock-primary: $color-primary;
17-
$clock-primary-contrast: $color-primary-contrast;
18-
$clock-primary-dark: $color-primary-dark;
16+
$clock-primary: $color-primary !default;
17+
$clock-primary-contrast: $color-primary-contrast !default;
18+
$clock-primary-dark: $color-primary-dark !default;
1919
$clock-primary-color: $clock-primary !default;
2020
$clock-primary-hover-color: rgba($clock-primary, 0.20) !default;
2121
$clock-primary-contrast-color: $clock-primary-contrast !default;

0 commit comments

Comments
 (0)