Skip to content

Commit 3b777eb

Browse files
committed
fix(material-experimental/slider): add slider mixin to main theme mixin (#18384)
* fix(material-experimental/slider): add slider mixin to main theme mixin * include universal app * fix universal (cherry picked from commit 2b937f1)
1 parent 350e598 commit 3b777eb

File tree

6 files changed

+3
-9
lines changed

6 files changed

+3
-9
lines changed

src/dev-app/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ sass_binary(
9595
],
9696
deps = [
9797
"//src/material-experimental/column-resize:column_resize_scss_lib",
98-
"//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
9998
"//src/material-experimental/mdc-theming:all_themes",
10099
"//src/material-experimental/mdc-typography:all_typography",
101100
"//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
@@ -1,5 +1,4 @@
11
@import '../material/core/theming/all-theme';
2-
@import '../material-experimental/mdc-slider/slider-theme';
32
@import '../material/core/focus-indicator/focus-indicator';
43
@import '../material-experimental/column-resize/column-resize';
54
@import '../material-experimental/mdc-helpers/mdc-helpers';
@@ -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-mdc-theme($candy-app-theme);
3332
@include mat-column-resize-theme($candy-app-theme);
34-
@include mat-mdc-slider-theme($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-mdc-theme($dark-theme);
5654
@include mat-column-resize-theme($dark-theme);
57-
@include mat-mdc-slider-theme($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/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-mdc-table-theme($theme);
2930
@include mat-mdc-form-field-theme($theme);
3031
@include mat-mdc-input-theme($theme);
31-
// TODO(andrewjs): Add this back when MDC syncs their slider code into Google-internal code
32-
// @include mat-mdc-slider-theme($theme);
32+
@include mat-mdc-slider-theme($theme);
3333
@include mat-mdc-tabs-theme($theme);
3434
}

src/universal-app/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ sass_binary(
4646
"external/npm/node_modules",
4747
],
4848
deps = [
49-
"//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
5049
"//src/material-experimental/mdc-theming:all_themes",
5150
"//src/material-experimental/mdc-typography:all_typography",
5251
"//src/material/core:theming_scss_lib",

src/universal-app/theme.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import '../material/core/theming/all-theme';
2-
@import '../material-experimental/mdc-slider/slider-theme';
32
@import '../material-experimental/mdc-theming/all-theme';
43
@import '../material-experimental/mdc-typography/all-typography';
54

@@ -19,4 +18,3 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
1918
// Include the default theme styles.
2019
@include angular-material-theme($candy-app-theme);
2120
@include angular-material-mdc-theme($candy-app-theme);
22-
@include mat-mdc-slider-theme($candy-app-theme);

0 commit comments

Comments
 (0)