|
20 | 20 | @use '../core/tokens/m2/mdc/text-button' as tokens-mdc-text-button;
|
21 | 21 | @use '../core/tokens/m2/mat/text-button' as tokens-mat-text-button;
|
22 | 22 |
|
23 |
| - |
24 | 23 | @mixin _text-button-variant($theme, $palette) {
|
25 |
| - $mdc-tokens: if($palette, |
| 24 | + $mdc-tokens: if( |
| 25 | + $palette, |
26 | 26 | tokens-mdc-text-button.private-get-color-palette-color-tokens($theme, $palette),
|
27 | 27 | tokens-mdc-text-button.get-color-tokens($theme)
|
28 | 28 | );
|
29 | 29 |
|
30 |
| - $mat-tokens: if($palette, |
| 30 | + $mat-tokens: if( |
| 31 | + $palette, |
31 | 32 | tokens-mat-text-button.private-get-color-palette-color-tokens($theme, $palette),
|
32 | 33 | tokens-mat-text-button.get-color-tokens($theme)
|
33 | 34 | );
|
|
37 | 38 | }
|
38 | 39 |
|
39 | 40 | @mixin _filled-button-variant($theme, $palette) {
|
40 |
| - $mdc-tokens: if($palette, |
| 41 | + $mdc-tokens: if( |
| 42 | + $palette, |
41 | 43 | tokens-mdc-filled-button.private-get-color-palette-color-tokens($theme, $palette),
|
42 | 44 | tokens-mdc-filled-button.get-color-tokens($theme)
|
43 | 45 | );
|
44 | 46 |
|
45 |
| - $mat-tokens: if($palette, |
| 47 | + $mat-tokens: if( |
| 48 | + $palette, |
46 | 49 | tokens-mat-filled-button.private-get-color-palette-color-tokens($theme, $palette),
|
47 | 50 | tokens-mat-filled-button.get-color-tokens($theme)
|
48 | 51 | );
|
|
52 | 55 | }
|
53 | 56 |
|
54 | 57 | @mixin _protected-button-variant($theme, $palette) {
|
55 |
| - $mdc-tokens: if($palette, |
| 58 | + $mdc-tokens: if( |
| 59 | + $palette, |
56 | 60 | tokens-mdc-protected-button.private-get-color-palette-color-tokens($theme, $palette),
|
57 | 61 | tokens-mdc-protected-button.get-color-tokens($theme)
|
58 | 62 | );
|
59 | 63 |
|
60 |
| - $mat-tokens: if($palette, |
| 64 | + $mat-tokens: if( |
| 65 | + $palette, |
61 | 66 | tokens-mat-protected-button.private-get-color-palette-color-tokens($theme, $palette),
|
62 | 67 | tokens-mat-protected-button.get-color-tokens($theme)
|
63 | 68 | );
|
|
67 | 72 | }
|
68 | 73 |
|
69 | 74 | @mixin _outlined-button-variant($theme, $palette) {
|
70 |
| - $mdc-tokens: if($palette, |
| 75 | + $mdc-tokens: if( |
| 76 | + $palette, |
71 | 77 | tokens-mdc-outlined-button.private-get-color-palette-color-tokens($theme, $palette),
|
72 | 78 | tokens-mdc-outlined-button.get-color-tokens($theme)
|
73 | 79 | );
|
74 | 80 |
|
75 |
| - $mat-tokens: if($palette, |
| 81 | + $mat-tokens: if( |
| 82 | + $palette, |
76 | 83 | tokens-mat-outlined-button.private-get-color-palette-color-tokens($theme, $palette),
|
77 | 84 | tokens-mat-outlined-button.get-color-tokens($theme)
|
78 | 85 | );
|
|
137 | 144 | @include mdc-helpers.disable-mdc-fallback-declarations {
|
138 | 145 | @include mdc-elevation-theme.elevation(2);
|
139 | 146 |
|
140 |
| - &:hover, &:focus { |
| 147 | + &:hover, |
| 148 | + &:focus { |
141 | 149 | @include mdc-elevation-theme.elevation(4);
|
142 | 150 | }
|
143 | 151 |
|
144 |
| - &:active, &:focus:active { |
| 152 | + &:active, |
| 153 | + &:focus:active { |
145 | 154 | @include mdc-elevation-theme.elevation(8);
|
146 | 155 | }
|
147 | 156 | }
|
|
169 | 178 | @include mdc-button.without-ripple($query: mdc-helpers.$mdc-typography-styles-query);
|
170 | 179 | }
|
171 | 180 |
|
| 181 | + .mat-mdc-button, |
172 | 182 | .mat-mdc-raised-button,
|
173 |
| - .mat-mdc-button { |
| 183 | + .mat-mdc-outlined-button { |
174 | 184 | line-height: inherit;
|
175 | 185 | }
|
176 | 186 | }
|
|
0 commit comments