Skip to content

Commit 7bc5a53

Browse files
committed
fix(material-experimental/slider): add slider mixin to main theme mixin
1 parent 9343d08 commit 7bc5a53

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

src/dev-app/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ sass_binary(
9494
],
9595
deps = [
9696
"//src/material-experimental/column-resize:column_resize_scss_lib",
97-
"//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
9897
"//src/material-experimental/mdc-theming:all_themes",
9998
"//src/material-experimental/mdc-typography:all_typography",
10099
"//src/material-experimental/popover-edit:popover_edit_scss_lib",

src/dev-app/theme.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
3131
@include angular-material-theme($candy-app-theme);
3232
@include angular-material-theme-mdc($candy-app-theme);
3333
@include mat-column-resize-theme($candy-app-theme);
34-
@include mat-slider-theme-mdc($candy-app-theme);
3534
@include mat-popover-edit-theme($candy-app-theme);
3635

3736
// Define an alternate dark theme.
@@ -54,7 +53,6 @@ $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
5453
@include angular-material-theme($dark-theme);
5554
@include angular-material-theme-mdc($dark-theme);
5655
@include mat-column-resize-theme($dark-theme);
57-
@include mat-slider-theme-mdc($dark-theme);
5856
@include mat-popover-edit-theme($dark-theme);
5957
}
6058

src/material-experimental/mdc-theming/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ sass_library(
2727
"//src/material-experimental/mdc-progress-bar:mdc_progress_bar_scss_lib",
2828
"//src/material-experimental/mdc-radio:mdc_radio_scss_lib",
2929
"//src/material-experimental/mdc-slide-toggle:mdc_slide_toggle_scss_lib",
30+
"//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
3031
"//src/material-experimental/mdc-table:mdc_table_scss_lib",
3132
"//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib",
3233
],

src/material-experimental/mdc-theming/_all-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@import '../mdc-menu/menu-theme';
77
@import '../mdc-radio/radio-theme';
88
@import '../mdc-slide-toggle/slide-toggle-theme';
9+
@import '../mdc-slider/slider-theme';
910
@import '../mdc-tabs/tabs-theme';
1011
@import '../mdc-table/table-theme';
1112
@import '../mdc-progress-bar/progress-bar-theme';
@@ -28,7 +29,6 @@
2829
@include mat-table-theme-mdc($theme);
2930
@include mat-form-field-theme-mdc($theme);
3031
@include mat-input-theme-mdc($theme);
31-
// TODO(andrewjs): Add this back when MDC syncs their slider code into Google-internal code
32-
// @include mat-slider-theme-mdc($theme);
32+
@include mat-slider-theme-mdc($theme);
3333
@include mat-tabs-theme-mdc($theme);
3434
}

0 commit comments

Comments
 (0)