|
1 |
| -// TODO: disabled until we implement the new MDC slider. |
2 |
| -// @import '@material/slider/mixins.import'; |
| 1 | +@import '@material/slider/slider'; |
| 2 | +@import '@material/slider/slider-theme'; |
3 | 3 | @import '../mdc-helpers/mdc-helpers';
|
| 4 | +@import '../../material/core/ripple/ripple'; |
4 | 5 |
|
5 | 6 | @mixin mat-mdc-slider-color($config-or-theme) {
|
6 | 7 | $config: mat-get-color-config($config-or-theme);
|
7 | 8 | @include mat-using-mdc-theme($config) {
|
8 |
| - // TODO: disabled until we implement the new MDC slider. |
9 |
| - // @include mdc-slider-core-styles($query: $mat-theme-styles-query); |
| 9 | + @include without-ripple($query: $mat-theme-styles-query); |
10 | 10 |
|
11 | 11 | .mat-mdc-slider {
|
| 12 | + &.mat-primary, &.mat-accent, &.mat-warn { |
| 13 | + @include value-indicator-color( |
| 14 | + $color: #000, |
| 15 | + $opacity: 0.6, |
| 16 | + $query: $mat-theme-styles-query |
| 17 | + ); |
| 18 | + @include value-indicator-text-color( |
| 19 | + $color: on-primary, |
| 20 | + $query: $mat-theme-styles-query |
| 21 | + ); |
| 22 | + @include tick-mark-active-color( |
| 23 | + $color-or-map: ( |
| 24 | + default: on-primary, |
| 25 | + disabled: on-primary, |
| 26 | + ), |
| 27 | + $query: $mat-theme-styles-query |
| 28 | + ); |
| 29 | + } |
| 30 | + |
12 | 31 | &.mat-primary {
|
13 |
| - // TODO: disabled until we implement the new MDC slider. |
14 |
| - // @include mdc-slider-color-accessible(primary, $mat-theme-styles-query); |
| 32 | + @include custom-slider-color(primary); |
| 33 | + } |
| 34 | + |
| 35 | + &.mat-accent { |
| 36 | + @include custom-slider-color(secondary); |
15 | 37 | }
|
16 | 38 |
|
17 | 39 | &.mat-warn {
|
18 |
| - // TODO: disabled until we implement the new MDC slider. |
19 |
| - // @include mdc-slider-color-accessible(error, $mat-theme-styles-query); |
| 40 | + @include custom-slider-color(error); |
20 | 41 | }
|
21 | 42 | }
|
22 | 43 | }
|
|
25 | 46 | @mixin mat-mdc-slider-typography($config-or-theme) {
|
26 | 47 | $config: mat-get-typography-config($config-or-theme);
|
27 | 48 | @include mat-using-mdc-typography($config) {
|
28 |
| - // TODO: disabled until we implement the new MDC slider. |
29 |
| - // @include mdc-slider-core-styles($query: $mat-typography-styles-query); |
| 49 | + @include without-ripple($query: $mat-typography-styles-query); |
30 | 50 | }
|
31 | 51 | }
|
32 | 52 |
|
|
51 | 71 | }
|
52 | 72 | }
|
53 | 73 |
|
| 74 | +@mixin custom-slider-color($color) { |
| 75 | + @include thumb-color( |
| 76 | + $color-or-map: ( |
| 77 | + default: $color, |
| 78 | + disabled: on-surface, |
| 79 | + ), |
| 80 | + $query: $mat-theme-styles-query |
| 81 | + ); |
| 82 | + @include track-active-color( |
| 83 | + $color-or-map: ( |
| 84 | + default: $color, |
| 85 | + disabled: on-surface, |
| 86 | + ), |
| 87 | + $query: $mat-theme-styles-query |
| 88 | + ); |
| 89 | + @include track-inactive-color( |
| 90 | + $color-or-map: ( |
| 91 | + default: $color, |
| 92 | + disabled: on-surface, |
| 93 | + ), |
| 94 | + $query: $mat-theme-styles-query |
| 95 | + ); |
| 96 | + @include tick-mark-inactive-color( |
| 97 | + $color-or-map: ( |
| 98 | + default: $color, |
| 99 | + disabled: on-primary, |
| 100 | + ), |
| 101 | + $query: $mat-theme-styles-query |
| 102 | + ); |
| 103 | + @include mat-ripple-color(( |
| 104 | + foreground: ( |
| 105 | + base: mdc-theme-prop-value($color) |
| 106 | + ), |
| 107 | + )); |
| 108 | +} |
0 commit comments