Skip to content

Commit efca3bf

Browse files
committed
fix(material-experimental): add mdc-slider to mdc-theming and mdc-typography
Follow-up to the initial implementation of the mdc-slider prototype. This commit adds the mdc-slider theme and typography to the `mdc-theming` and `mdc-typography` entry-points, so that consumers don't need to include the slider styles separately.
1 parent 4fad340 commit efca3bf

File tree

5 files changed

+7
-1
lines changed

5 files changed

+7
-1
lines changed

src/material-experimental/mdc-slider/slider.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
2525
import {By} from '@angular/platform-browser';
2626
import {MatSlider, MatSliderModule} from './index';
2727

28-
describe('MatMdcSlider', () => {
28+
fdescribe('MatMdcSlider', () => {
2929
const platform = new Platform();
3030

3131
function createComponent<T>(component: Type<T>): ComponentFixture<T> {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ sass_library(
1515
"//src/material-experimental/mdc-menu:mdc_menu_scss_lib",
1616
"//src/material-experimental/mdc-radio:mdc_radio_scss_lib",
1717
"//src/material-experimental/mdc-slide-toggle:mdc_slide_toggle_scss_lib",
18+
"//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
1819
"//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib",
1920
],
2021
)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@import '../mdc-menu/mdc-menu';
66
@import '../mdc-radio/mdc-radio';
77
@import '../mdc-slide-toggle/mdc-slide-toggle';
8+
@import '../mdc-slider/mdc-slider';
89
@import '../mdc-tabs/mdc-tabs';
910

1011
@mixin angular-material-theme-mdc($theme) {
@@ -17,5 +18,6 @@
1718
@include mat-menu-theme-mdc($theme);
1819
@include mat-radio-theme-mdc($theme);
1920
@include mat-slide-toggle-theme-mdc($theme);
21+
@include mat-slider-theme-mdc($theme);
2022
@include mat-tabs-theme-mdc($theme);
2123
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ sass_library(
1515
"//src/material-experimental/mdc-menu:mdc_menu_scss_lib",
1616
"//src/material-experimental/mdc-radio:mdc_radio_scss_lib",
1717
"//src/material-experimental/mdc-slide-toggle:mdc_slide_toggle_scss_lib",
18+
"//src/material-experimental/mdc-slider:mdc_slider_scss_lib",
1819
"//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib",
1920
],
2021
)

src/material-experimental/mdc-typography/_all-typography.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@import '../mdc-menu/mdc-menu';
66
@import '../mdc-radio/mdc-radio';
77
@import '../mdc-slide-toggle/mdc-slide-toggle';
8+
@import '../mdc-slider/mdc-slider';
89
@import '../mdc-tabs/mdc-tabs';
910

1011
@mixin angular-material-typography-mdc($config: null) {
@@ -17,5 +18,6 @@
1718
@include mat-menu-typography-mdc($config);
1819
@include mat-radio-typography-mdc($config);
1920
@include mat-slide-toggle-typography-mdc($config);
21+
@include mat-slider-typography-mdc($config);
2022
@include mat-tabs-typography-mdc($config);
2123
}

0 commit comments

Comments
 (0)