Skip to content

Commit c6d609b

Browse files
committed
fix(material-experimental/slider): add slider mixin to main theme mixin
1 parent 01e4fba commit c6d609b

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

src/dev-app/BUILD.bazel

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

src/dev-app/theme.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@import '../material/core/focus-indicator/focus-indicator';
33
@import '../material-experimental/column-resize/column-resize';
44
@import '../material-experimental/mdc-helpers/mdc-helpers';
5-
@import '../material-experimental/mdc-slider/mdc-slider';
65
@import '../material-experimental/mdc-theming/all-theme';
76
@import '../material-experimental/mdc-typography/all-typography';
87
@import '../material-experimental/popover-edit/popover-edit';
@@ -31,7 +30,6 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
3130
@include angular-material-theme($candy-app-theme);
3231
@include angular-material-theme-mdc($candy-app-theme);
3332
@include mat-column-resize-theme($candy-app-theme);
34-
@include mat-slider-theme-mdc($candy-app-theme);
3533
@include mat-popover-edit-theme($candy-app-theme);
3634

3735
// Define an alternate dark theme.
@@ -54,7 +52,6 @@ $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
5452
@include angular-material-theme($dark-theme);
5553
@include angular-material-theme-mdc($dark-theme);
5654
@include mat-column-resize-theme($dark-theme);
57-
@include mat-slider-theme-mdc($dark-theme);
5855
@include mat-popover-edit-theme($dark-theme);
5956
}
6057

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/mdc-menu';
77
@import '../mdc-radio/mdc-radio';
88
@import '../mdc-slide-toggle/mdc-slide-toggle';
9+
@import '../mdc-slider/mdc-slider';
910
@import '../mdc-tabs/mdc-tabs';
1011
@import '../mdc-table/mdc-table';
1112
@import '../mdc-progress-bar/mdc-progress-bar';
@@ -27,7 +28,6 @@
2728
@include mat-table-theme-mdc($theme);
2829
@include mat-form-field-theme-mdc($theme);
2930
@include mat-input-theme-mdc($theme);
30-
// TODO(andrewjs): Add this back when MDC syncs their slider code into Google-internal code
31-
// @include mat-slider-theme-mdc($theme);
31+
@include mat-slider-theme-mdc($theme);
3232
@include mat-tabs-theme-mdc($theme);
3333
}

0 commit comments

Comments
 (0)