File tree Expand file tree Collapse file tree 4 files changed +32
-12
lines changed Expand file tree Collapse file tree 4 files changed +32
-12
lines changed Original file line number Diff line number Diff line change 5
5
@import ' ../../card/card-theme' ;
6
6
@import ' ../../checkbox/checkbox-theme' ;
7
7
@import ' ../../chips/chips-theme' ;
8
+ @import ' ../../datepicker/datepicker-theme' ;
8
9
@import ' ../../dialog/dialog-theme' ;
9
10
@import ' ../../grid-list/grid-list-theme' ;
10
11
@import ' ../../icon/icon-theme' ;
34
35
@include mat-card-typography ($config );
35
36
@include mat-checkbox-typography ($config );
36
37
@include mat-chips-typography ($config );
38
+ @include mat-datepicker-typography ($config );
37
39
@include mat-dialog-typography ($config );
38
40
@include mat-grid-list-typography ($config );
39
41
@include mat-icon-typography ($config );
Original file line number Diff line number Diff line change 1
1
@import ' ../core/theming/palette' ;
2
2
@import ' ../core/theming/theming' ;
3
+ @import ' ../core/typography/typography-utils' ;
4
+
5
+
6
+ $mat-calendar-body-font-size : 13px !default ;
7
+ $mat-calendar-weekday-table-font-size : 11px !default ;
3
8
4
9
5
10
@mixin mat-datepicker-theme ($theme ) {
78
83
border-color : fade-out (mat-color ($foreground , hint-text ), $mat-datepicker-today-fade-amount );
79
84
}
80
85
}
86
+
87
+ @mixin mat-datepicker-typography ($config ) {
88
+ .mat-calendar {
89
+ font-family : mat-font-family ($config );
90
+ }
91
+
92
+ .mat-calendar-body {
93
+ font-size : $mat-calendar-body-font-size ;
94
+ }
95
+
96
+ .mat-calendar-body-label ,
97
+ .mat-calendar-period-button {
98
+ font : {
99
+ size : mat-font-size ($config , button );
100
+ weight : mat-font-weight ($config , button );
101
+ }
102
+ }
103
+
104
+ .mat-calendar-table-header th {
105
+ font : {
106
+ size : $mat-calendar-weekday-table-font-size ;
107
+ weight : mat-font-weight ($config , body-1 );
108
+ }
109
+ }
110
+ }
Original file line number Diff line number Diff line change 1
- $mat-calendar-body-font-size : 13px !default ;
2
- $mat-calendar-body-header-font-size : 14px !default ;
3
1
$mat-calendar-body-label-padding-start : 5% !default ;
4
2
$mat-calendar-body-label-translation : -6px !default ;
5
3
$mat-calendar-body-cell-min-size : 32px !default ;
@@ -13,7 +11,6 @@ $mat-calendar-body-cell-content-size: 100% - $mat-calendar-body-cell-content-mar
13
11
14
12
15
13
.mat-calendar-body {
16
- font-size : $mat-calendar-body-font-size ;
17
14
min-width : $mat-calendar-body-min-size ;
18
15
}
19
16
@@ -24,8 +21,6 @@ $mat-calendar-body-cell-content-size: 100% - $mat-calendar-body-cell-content-mar
24
21
line-height : 0 ;
25
22
transform : translateX ($mat-calendar-body-label-translation );
26
23
text-align : left ;
27
- font-size : $mat-calendar-body-header-font-size ;
28
- font-weight : bold ;
29
24
}
30
25
31
26
.mat-calendar-body-cell {
Original file line number Diff line number Diff line change @@ -6,10 +6,8 @@ $mat-calendar-controls-vertical-padding: 5%;
6
6
$mat-calendar-controls-start-padding : calc (100% / 14 - 22px );
7
7
// Same as above, but on other side for arrows.
8
8
$mat-calendar-controls-end-padding : calc (100% / 14 - 22px );
9
- $mat-calendar-period-font-size : 14px ;
10
9
$mat-calendar-arrow-size : 5px !default ;
11
10
$mat-calendar-arrow-disabled-opacity : 0.5 !default ;
12
- $mat-calendar-weekday-table-font-size : 11px !default ;
13
11
14
12
// Values chosen to approximate https://material.io/icons/#ic_navigate_before and
15
13
// https://material.io/icons/#ic_navigate_next as closely as possible.
@@ -43,9 +41,6 @@ $mat-calendar-next-icon-transform: translateX(-2px) rotate(45deg);
43
41
}
44
42
45
43
.mat-calendar-period-button {
46
- font : inherit ;
47
- font-size : $mat-calendar-period-font-size ;
48
- font-weight : bold ;
49
44
min-width : 0 ;
50
45
}
51
46
@@ -108,8 +103,6 @@ $mat-calendar-next-icon-transform: translateX(-2px) rotate(45deg);
108
103
109
104
.mat-calendar-table-header th {
110
105
text-align : center ;
111
- font-size : $mat-calendar-weekday-table-font-size ;
112
- font-weight : normal ;
113
106
padding : 0 0 $mat-calendar-padding 0 ;
114
107
}
115
108
You can’t perform that action at this time.
0 commit comments