Skip to content

Commit de3f442

Browse files
committed
fix(material/button): fix outlined button line-height
1 parent 603f550 commit de3f442

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

src/material/button/_button-theme.scss

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@
2020
@use '../core/tokens/m2/mdc/text-button' as tokens-mdc-text-button;
2121
@use '../core/tokens/m2/mat/text-button' as tokens-mat-text-button;
2222

23-
2423
@mixin _text-button-variant($theme, $palette) {
25-
$mdc-tokens: if($palette,
24+
$mdc-tokens: if(
25+
$palette,
2626
tokens-mdc-text-button.private-get-color-palette-color-tokens($theme, $palette),
2727
tokens-mdc-text-button.get-color-tokens($theme)
2828
);
2929

30-
$mat-tokens: if($palette,
30+
$mat-tokens: if(
31+
$palette,
3132
tokens-mat-text-button.private-get-color-palette-color-tokens($theme, $palette),
3233
tokens-mat-text-button.get-color-tokens($theme)
3334
);
@@ -37,12 +38,14 @@
3738
}
3839

3940
@mixin _filled-button-variant($theme, $palette) {
40-
$mdc-tokens: if($palette,
41+
$mdc-tokens: if(
42+
$palette,
4143
tokens-mdc-filled-button.private-get-color-palette-color-tokens($theme, $palette),
4244
tokens-mdc-filled-button.get-color-tokens($theme)
4345
);
4446

45-
$mat-tokens: if($palette,
47+
$mat-tokens: if(
48+
$palette,
4649
tokens-mat-filled-button.private-get-color-palette-color-tokens($theme, $palette),
4750
tokens-mat-filled-button.get-color-tokens($theme)
4851
);
@@ -52,12 +55,14 @@
5255
}
5356

5457
@mixin _protected-button-variant($theme, $palette) {
55-
$mdc-tokens: if($palette,
58+
$mdc-tokens: if(
59+
$palette,
5660
tokens-mdc-protected-button.private-get-color-palette-color-tokens($theme, $palette),
5761
tokens-mdc-protected-button.get-color-tokens($theme)
5862
);
5963

60-
$mat-tokens: if($palette,
64+
$mat-tokens: if(
65+
$palette,
6166
tokens-mat-protected-button.private-get-color-palette-color-tokens($theme, $palette),
6267
tokens-mat-protected-button.get-color-tokens($theme)
6368
);
@@ -67,12 +72,14 @@
6772
}
6873

6974
@mixin _outlined-button-variant($theme, $palette) {
70-
$mdc-tokens: if($palette,
75+
$mdc-tokens: if(
76+
$palette,
7177
tokens-mdc-outlined-button.private-get-color-palette-color-tokens($theme, $palette),
7278
tokens-mdc-outlined-button.get-color-tokens($theme)
7379
);
7480

75-
$mat-tokens: if($palette,
81+
$mat-tokens: if(
82+
$palette,
7683
tokens-mat-outlined-button.private-get-color-palette-color-tokens($theme, $palette),
7784
tokens-mat-outlined-button.get-color-tokens($theme)
7885
);
@@ -137,11 +144,13 @@
137144
@include mdc-helpers.disable-mdc-fallback-declarations {
138145
@include mdc-elevation-theme.elevation(2);
139146

140-
&:hover, &:focus {
147+
&:hover,
148+
&:focus {
141149
@include mdc-elevation-theme.elevation(4);
142150
}
143151

144-
&:active, &:focus:active {
152+
&:active,
153+
&:focus:active {
145154
@include mdc-elevation-theme.elevation(8);
146155
}
147156
}
@@ -169,8 +178,9 @@
169178
@include mdc-button.without-ripple($query: mdc-helpers.$mdc-typography-styles-query);
170179
}
171180

181+
.mat-mdc-button,
172182
.mat-mdc-raised-button,
173-
.mat-mdc-button {
183+
.mat-mdc-outlined-button {
174184
line-height: inherit;
175185
}
176186
}

0 commit comments

Comments
 (0)