Skip to content

Commit c85e62a

Browse files
committed
fix(material-experimental/mdc-slider): code review changes
* move tick-mark-active-color into _custom-slider-color to ensure it uses the correct on-color * add an -color arg to _custom-slider-color so we don't just use on-primary for everything * added more examples to mdc-slider-demo.html to make a pretty example from these changes
1 parent b167da2 commit c85e62a

File tree

2 files changed

+43
-15
lines changed

2 files changed

+43
-15
lines changed
Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
1-
<mat-slider min="-5" max="0" discrete showTickMarks>
2-
<input matSliderStartThumb>
3-
<input matSliderEndThumb>
1+
<p>Color: Primary</p>
2+
<mat-slider color="primary" discrete showTickMarks>
3+
<input value="25" matSliderStartThumb>
4+
<input value="75" matSliderEndThumb>
5+
</mat-slider>
6+
7+
<mat-slider color="primary" discrete showTickMarks disabled>
8+
<input value="25" matSliderStartThumb>
9+
<input value="75" matSliderEndThumb>
10+
</mat-slider>
11+
12+
<p>Color: Accent</p>
13+
<mat-slider color="accent" discrete showTickMarks>
14+
<input value="25" matSliderStartThumb>
15+
<input value="75" matSliderEndThumb>
16+
</mat-slider>
17+
18+
<mat-slider color="accent" discrete showTickMarks disabled>
19+
<input value="25" matSliderStartThumb>
20+
<input value="75" matSliderEndThumb>
21+
</mat-slider>
22+
23+
<p>Color: Warn</p>
24+
<mat-slider color="warn" discrete showTickMarks>
25+
<input value="25" matSliderStartThumb>
26+
<input value="75" matSliderEndThumb>
27+
</mat-slider>
28+
29+
<mat-slider color="warn" discrete showTickMarks disabled>
30+
<input value="25" matSliderStartThumb>
31+
<input value="75" matSliderEndThumb>
432
</mat-slider>

src/material-experimental/mdc-slider/_slider-theme.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,18 @@
2323
$color: $indicator-text-color,
2424
$query: $mat-theme-styles-query
2525
);
26-
@include tick-mark-active-color(
27-
$color-or-map: (
28-
default: on-primary,
29-
disabled: on-primary,
30-
),
31-
$query: $mat-theme-styles-query
32-
);
3326
}
3427

3528
&.mat-primary {
36-
@include _custom-slider-color(primary);
29+
@include _custom-slider-color(primary, on-primary);
3730
}
3831

3932
&.mat-accent {
40-
@include _custom-slider-color(secondary);
33+
@include _custom-slider-color(secondary, on-secondary);
4134
}
4235

4336
&.mat-warn {
44-
@include _custom-slider-color(error);
37+
@include _custom-slider-color(error, on-error);
4538
}
4639
}
4740
}
@@ -75,7 +68,7 @@
7568
}
7669
}
7770

78-
@mixin _custom-slider-color($color) {
71+
@mixin _custom-slider-color($color, $on-color) {
7972
@include thumb-color(
8073
$color-or-map: (
8174
default: $color,
@@ -97,10 +90,17 @@
9790
),
9891
$query: $mat-theme-styles-query
9992
);
93+
@include tick-mark-active-color(
94+
$color-or-map: (
95+
default: $on-color,
96+
disabled: $on-color,
97+
),
98+
$query: $mat-theme-styles-query
99+
);
100100
@include tick-mark-inactive-color(
101101
$color-or-map: (
102102
default: $color,
103-
disabled: on-primary,
103+
disabled: $on-color,
104104
),
105105
$query: $mat-theme-styles-query
106106
);

0 commit comments

Comments
 (0)