File tree Expand file tree Collapse file tree 7 files changed +11
-44
lines changed
src/material-experimental Expand file tree Collapse file tree 7 files changed +11
-44
lines changed Original file line number Diff line number Diff line change 7
7
}
8
8
9
9
@mixin mat-button-typography-mdc ($config ) {
10
- @if config {
11
- @include mat-using-mdc-typography ($config ) {
12
- // TODO: MDC typography styles here.
13
- }
14
- }
15
- @else {
10
+ @include mat-using-mdc-typography ($config ) {
16
11
// TODO: MDC typography styles here.
17
12
}
18
13
}
Original file line number Diff line number Diff line change 7
7
}
8
8
9
9
@mixin mat-card-typography-mdc ($config ) {
10
- @if config {
11
- @include mat-using-mdc-typography ($config ) {
12
- // TODO: MDC typography styles here.
13
- }
14
- }
15
- @else {
10
+ @include mat-using-mdc-typography ($config ) {
16
11
// TODO: MDC typography styles here.
17
12
}
18
13
}
Original file line number Diff line number Diff line change 66
66
}
67
67
68
68
@mixin mat-checkbox-typography-mdc ($config : null) {
69
- @if $config {
70
- @include mat-using-mdc-typography ($config ) {
71
- @include mdc-checkbox-without-ripple ($query : $mat-typography-styles-query );
72
- @include mdc-form-field-core-styles ($query : $mat-typography-styles-query );
73
- }
74
- }
75
- @else {
69
+ @include mat-using-mdc-typography ($config ) {
76
70
@include mdc-checkbox-without-ripple ($query : $mat-typography-styles-query );
77
71
@include mdc-form-field-core-styles ($query : $mat-typography-styles-query );
78
72
}
Original file line number Diff line number Diff line change @@ -199,7 +199,9 @@ $mat-typography-level-mappings: (
199
199
$orig-mdc-typography-styles : $mdc-typography-styles ;
200
200
201
201
// Set new values based on the given Angular Material typography configuration.
202
- $mdc-typography-styles : mat-typography-config-to-mdc ($config ) !global;
202
+ @if $config {
203
+ $mdc-typography-styles : mat-typography-config-to-mdc ($config ) !global;
204
+ }
203
205
204
206
// Apply given rules.
205
207
@content ;
Original file line number Diff line number Diff line change 39
39
}
40
40
41
41
@mixin mat-menu-typography-mdc ($config ) {
42
- @if config {
43
- @include mat-using-mdc-typography ($config ) {
44
- @include mdc-menu-surface-core-styles ($mat-typography-styles-query );
45
-
46
- .mat-mdc-menu-content {
47
- // Note that we include this private mixin, because the public
48
- // one adds a bunch of styles that we aren't using for the menu.
49
- @include mdc-list-base_ ($mat-typography-styles-query );
50
- }
51
- }
52
- }
53
- @else {
42
+ @include mat-using-mdc-typography ($config ) {
54
43
@include mdc-menu-surface-core-styles ($mat-typography-styles-query );
55
44
56
45
.mat-mdc-menu-content {
46
+ // Note that we include this private mixin, because the public
47
+ // one adds a bunch of styles that we aren't using for the menu.
57
48
@include mdc-list-base_ ($mat-typography-styles-query );
58
49
}
59
50
}
Original file line number Diff line number Diff line change 7
7
}
8
8
9
9
@mixin mat-radio-typography-mdc ($config ) {
10
- @if config {
11
- @include mat-using-mdc-typography ($config ) {
12
- // TODO: MDC typography styles here.
13
- }
14
- }
15
- @else {
10
+ @include mat-using-mdc-typography ($config ) {
16
11
// TODO: MDC typography styles here.
17
12
}
18
13
}
Original file line number Diff line number Diff line change 7
7
}
8
8
9
9
@mixin mat-slide-toggle-typography-mdc ($config ) {
10
- @if config {
11
- @include mat-using-mdc-typography ($config ) {
12
- // TODO: MDC typography styles here.
13
- }
14
- }
15
- @else {
10
+ @include mat-using-mdc-typography ($config ) {
16
11
// TODO: MDC typography styles here.
17
12
}
18
13
}
You can’t perform that action at this time.
0 commit comments