File tree 2 files changed +24
-18
lines changed
2 files changed +24
-18
lines changed Original file line number Diff line number Diff line change 27
27
@mixin mat-card-typography ($config ) {
28
28
.mat-card {
29
29
font-family : mat-font-family ($config );
30
- }
31
30
32
- .mat-card-title {
33
- font : {
34
- size : mat-font-size ($config , headline );
35
- weight : mat-font-weight ($config , title );
31
+ // These need the extra specificity, because they can be
32
+ // easily overridden by the global typography styles.
33
+ .mat-card-title {
34
+ font-size : mat-font-size ($config , headline );
35
+ font-weight : mat-font-weight ($config , headline );
36
+ line-height : normal ;
36
37
}
37
- }
38
38
39
- .mat-card-header .mat-card-title {
40
- font-size : mat-font-size ($config , title );
41
- }
39
+ .mat-card-header .mat-card-title {
40
+ font-size : mat-font-size ($config , title );
41
+ }
42
42
43
- .mat-card-subtitle ,
44
- .mat-card-content {
45
- font-size : mat-font-size ($config , body-1 );
43
+ .mat-card-subtitle ,
44
+ .mat-card-content {
45
+ font-size : mat-font-size ($config , body-1 );
46
+ }
46
47
}
47
48
}
Original file line number Diff line number Diff line change @@ -46,15 +46,20 @@ $mat-card-header-size: 40px !default;
46
46
margin-bottom : 16px ;
47
47
}
48
48
49
- .mat-card-title {
50
- display : block ;
51
- margin-bottom : 8px ;
52
- }
49
+ .mat-card {
50
+ // Needs slightly higher specificity due to it potentially
51
+ // being overridden by the global typography styles.
52
+ .mat-card-title {
53
+ display : block ;
54
+ margin-bottom : 8px ;
55
+ }
53
56
54
- .mat-card-subtitle , .mat-card-content {
55
- @extend %mat-card-section-base ;
57
+ .mat-card-subtitle , .mat-card-content {
58
+ @extend %mat-card-section-base ;
59
+ }
56
60
}
57
61
62
+
58
63
.mat-card-actions {
59
64
@extend %mat-card-section-base ;
60
65
margin-left : - $mat-card-padding / 2 ;
You can’t perform that action at this time.
0 commit comments