Skip to content

Commit 7b1a978

Browse files
devversionandrewseguin
devversion
authored and
andrewseguin
committed
refactor: denote density mixins for material components as internal
We want to denote density mixins for components of the `material` package as internal for now. This is because those mixins don't do anything yet and could cause people to think that they could be already used to control density.
1 parent 84f2c1a commit 7b1a978

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+86
-86
lines changed

‎src/material/autocomplete/_autocomplete-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
@mixin mat-autocomplete-typography($config) { }
2929

30-
@mixin mat-autocomplete-density($density-scale) { }
30+
@mixin _mat-autocomplete-density($density-scale) { }
3131

3232
@mixin mat-autocomplete-theme($theme) {
3333
$color: mat-get-color-config($theme);
@@ -38,7 +38,7 @@
3838
@include mat-autocomplete-color($color);
3939
}
4040
@if $density != null {
41-
@include mat-autocomplete-density($density);
41+
@include _mat-autocomplete-density($density);
4242
}
4343
@if $typography != null {
4444
@include mat-autocomplete-typography($typography);

‎src/material/badge/_badge-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ $mat-badge-large-size: $mat-badge-default-size + 6;
203203
}
204204
}
205205

206-
@mixin mat-badge-density($density-scale) {}
206+
@mixin _mat-badge-density($density-scale) {}
207207

208208
@mixin mat-badge-theme($theme) {
209209
$color: mat-get-color-config($theme);
@@ -214,7 +214,7 @@ $mat-badge-large-size: $mat-badge-default-size + 6;
214214
@include mat-badge-color($color);
215215
}
216216
@if $density != null {
217-
@include mat-badge-density($density);
217+
@include _mat-badge-density($density);
218218
}
219219
@if $typography != null {
220220
@include mat-badge-typography($typography);

‎src/material/bottom-sheet/_bottom-sheet-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
}
2222

23-
@mixin mat-bottom-sheet-density($density-scale) {}
23+
@mixin _mat-bottom-sheet-density($density-scale) {}
2424

2525
@mixin mat-bottom-sheet-theme($theme) {
2626
$color: mat-get-color-config($theme);
@@ -31,7 +31,7 @@
3131
@include mat-bottom-sheet-color($color);
3232
}
3333
@if $density != null {
34-
@include mat-bottom-sheet-density($density);
34+
@include _mat-bottom-sheet-density($density);
3535
}
3636
@if $typography != null {
3737
@include mat-bottom-sheet-typography($typography);

‎src/material/button-toggle/_button-toggle-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
}
8787
}
8888

89-
@mixin mat-button-toggle-density($density-scale) {}
89+
@mixin _mat-button-toggle-density($density-scale) {}
9090

9191
@mixin mat-button-toggle-theme($theme) {
9292
$color: mat-get-color-config($theme);
@@ -97,7 +97,7 @@
9797
@include mat-button-toggle-color($color);
9898
}
9999
@if $density != null {
100-
@include mat-button-toggle-density($density);
100+
@include _mat-button-toggle-density($density);
101101
}
102102
@if $typography != null {
103103
@include mat-button-toggle-typography($typography);

‎src/material/button/_button-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ $_mat-button-ripple-opacity: 0.1;
169169
}
170170
}
171171

172-
@mixin mat-button-density($density-scale) {}
172+
@mixin _mat-button-density($density-scale) {}
173173

174174
@mixin mat-button-theme($theme) {
175175
$color: mat-get-color-config($theme);
@@ -180,7 +180,7 @@ $_mat-button-ripple-opacity: 0.1;
180180
@include mat-button-color($color);
181181
}
182182
@if $density != null {
183-
@include mat-button-density($density);
183+
@include _mat-button-density($density);
184184
}
185185
@if $typography != null {
186186
@include mat-button-typography($typography);

‎src/material/card/_card-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
}
4747
}
4848

49-
@mixin mat-card-density($density-scale) {}
49+
@mixin _mat-card-density($density-scale) {}
5050

5151
@mixin mat-card-theme($theme) {
5252
$color: mat-get-color-config($theme);
@@ -57,7 +57,7 @@
5757
@include mat-card-color($color);
5858
}
5959
@if $density != null {
60-
@include mat-card-density($density);
60+
@include _mat-card-density($density);
6161
}
6262
@if $typography != null {
6363
@include mat-card-typography($typography);

‎src/material/checkbox/_checkbox-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
}
106106
}
107107

108-
@mixin mat-checkbox-density($density-scale) {}
108+
@mixin _mat-checkbox-density($density-scale) {}
109109

110110
@mixin mat-checkbox-theme($theme) {
111111
$color: mat-get-color-config($theme);
@@ -116,7 +116,7 @@
116116
@include mat-checkbox-color($color);
117117
}
118118
@if $density != null {
119-
@include mat-checkbox-density($density);
119+
@include _mat-checkbox-density($density);
120120
}
121121
@if $typography != null {
122122
@include mat-checkbox-typography($typography);

‎src/material/chips/_chips-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ $mat-chip-remove-font-size: 18px;
9797
}
9898
}
9999

100-
@mixin mat-chips-density($density-scale) {}
100+
@mixin _mat-chips-density($density-scale) {}
101101

102102
@mixin mat-chips-theme($theme) {
103103
$color: mat-get-color-config($theme);
@@ -108,7 +108,7 @@ $mat-chip-remove-font-size: 18px;
108108
@include mat-chips-color($color);
109109
}
110110
@if $density != null {
111-
@include mat-chips-density($density);
111+
@include _mat-chips-density($density);
112112
}
113113
@if $typography != null {
114114
@include mat-chips-typography($typography);

‎src/material/core/option/_optgroup-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
}
2222

23-
@mixin mat-optgroup-density($density-scale) {}
23+
@mixin _mat-optgroup-density($density-scale) {}
2424

2525
@mixin mat-optgroup-theme($theme) {
2626
$color: mat-get-color-config($theme);
@@ -31,7 +31,7 @@
3131
@include mat-optgroup-color($color);
3232
}
3333
@if $density != null {
34-
@include mat-optgroup-density($density);
34+
@include _mat-optgroup-density($density);
3535
}
3636
@if $typography != null {
3737
@include mat-optgroup-typography($typography);

‎src/material/core/option/_option-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555
}
5656

57-
@mixin mat-option-density($density-scale) {}
57+
@mixin _mat-option-density($density-scale) {}
5858

5959
@mixin mat-option-theme($theme) {
6060
$color: mat-get-color-config($theme);
@@ -65,7 +65,7 @@
6565
@include mat-option-color($color);
6666
}
6767
@if $density != null {
68-
@include mat-option-density($density);
68+
@include _mat-option-density($density);
6969
}
7070
@if $typography != null {
7171
@include mat-option-typography($typography);

‎src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
}
5959

6060
@mixin mat-pseudo-checkbox-typography($config) {}
61-
@mixin mat-pseudo-checkbox-density($density-scale) {}
61+
@mixin _mat-pseudo-checkbox-density($density-scale) {}
6262

6363
@mixin mat-pseudo-checkbox-theme($theme) {
6464
$color: mat-get-color-config($theme);
@@ -69,7 +69,7 @@
6969
@include mat-pseudo-checkbox-color($color);
7070
}
7171
@if $density != null {
72-
@include mat-pseudo-checkbox-density($density);
72+
@include _mat-pseudo-checkbox-density($density);
7373
}
7474
@if $typography != null {
7575
@include mat-pseudo-checkbox-typography($typography);

‎src/material/datepicker/_datepicker-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ $mat-calendar-weekday-table-font-size: 11px !default;
215215
}
216216
}
217217

218-
@mixin mat-datepicker-density($density-scale) {}
218+
@mixin _mat-datepicker-density($density-scale) {}
219219

220220
@mixin mat-datepicker-theme($theme) {
221221
$color: mat-get-color-config($theme);
@@ -226,7 +226,7 @@ $mat-calendar-weekday-table-font-size: 11px !default;
226226
@include mat-datepicker-color($color);
227227
}
228228
@if $density != null {
229-
@include mat-datepicker-density($density);
229+
@include _mat-datepicker-density($density);
230230
}
231231
@if $typography != null {
232232
@include mat-datepicker-typography($typography);

‎src/material/dialog/_dialog-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
}
2323

24-
@mixin mat-dialog-density($density-scale) {}
24+
@mixin _mat-dialog-density($density-scale) {}
2525

2626
@mixin mat-dialog-theme($theme) {
2727
$color: mat-get-color-config($theme);
@@ -32,7 +32,7 @@
3232
@include mat-dialog-color($color);
3333
}
3434
@if $density != null {
35-
@include mat-dialog-density($density);
35+
@include _mat-dialog-density($density);
3636
}
3737
@if $typography != null {
3838
@include mat-dialog-typography($typography);

‎src/material/divider/_divider-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
}
1616

17-
@mixin mat-divider-density($density-scale) {}
17+
@mixin _mat-divider-density($density-scale) {}
1818

1919
@mixin mat-divider-theme($theme) {
2020
$color: mat-get-color-config($theme);
@@ -25,7 +25,7 @@
2525
@include mat-divider-color($color);
2626
}
2727
@if $density != null {
28-
@include mat-divider-density($density);
28+
@include _mat-divider-density($density);
2929
}
3030
@if $typography != null {
3131
@include mat-divider-typography($typography);

‎src/material/expansion/_expansion-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
}
7070
}
7171

72-
@mixin mat-expansion-panel-density($density-scale) {}
72+
@mixin _mat-expansion-panel-density($density-scale) {}
7373

7474
@mixin mat-expansion-panel-theme($theme) {
7575
$color: mat-get-color-config($theme);
@@ -80,7 +80,7 @@
8080
@include mat-expansion-panel-color($color);
8181
}
8282
@if $density != null {
83-
@include mat-expansion-panel-density($density);
83+
@include _mat-expansion-panel-density($density);
8484
}
8585
@if $typography != null {
8686
@include mat-expansion-panel-typography($typography);

‎src/material/form-field/_form-field-fill-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ $mat-form-field-fill-dedupe: 0;
9999
}
100100
}
101101

102-
@mixin mat-form-field-fill-density($density-scale) {}
102+
@mixin _mat-form-field-fill-density($density-scale) {}
103103

104104
@mixin mat-form-field-fill-theme($theme) {
105105
$color: mat-get-color-config($theme);
@@ -110,7 +110,7 @@ $mat-form-field-fill-dedupe: 0;
110110
@include mat-form-field-fill-color($color);
111111
}
112112
@if $density != null {
113-
@include mat-form-field-fill-density($density);
113+
@include _mat-form-field-fill-density($density);
114114
}
115115
@if $typography != null {
116116
@include mat-form-field-fill-typography($typography);

‎src/material/form-field/_form-field-legacy-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ $mat-form-field-legacy-dedupe: 0;
172172
}
173173
}
174174

175-
@mixin mat-form-field-legacy-density($density-scale) {}
175+
@mixin _mat-form-field-legacy-density($density-scale) {}
176176

177177
@mixin mat-form-field-legacy-theme($theme) {
178178
$color: mat-get-color-config($theme);
@@ -183,7 +183,7 @@ $mat-form-field-legacy-dedupe: 0;
183183
@include mat-form-field-legacy-color($color);
184184
}
185185
@if $density != null {
186-
@include mat-form-field-legacy-density($density);
186+
@include _mat-form-field-legacy-density($density);
187187
}
188188
@if $typography != null {
189189
@include mat-form-field-legacy-typography($typography);

‎src/material/form-field/_form-field-outline-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ $mat-form-field-outline-dedupe: 0;
129129
}
130130
}
131131

132-
@mixin mat-form-field-outline-density($density-scale) {}
132+
@mixin _mat-form-field-outline-density($density-scale) {}
133133

134134
@mixin mat-form-field-outline-theme($theme) {
135135
$color: mat-get-color-config($theme);
@@ -140,7 +140,7 @@ $mat-form-field-outline-dedupe: 0;
140140
@include mat-form-field-outline-color($color);
141141
}
142142
@if $density != null {
143-
@include mat-form-field-outline-density($density);
143+
@include _mat-form-field-outline-density($density);
144144
}
145145
@if $typography != null {
146146
@include mat-form-field-outline-typography($typography);

‎src/material/form-field/_form-field-standard-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
@mixin mat-form-field-standard-typography($config) {}
2727

28-
@mixin mat-form-field-standard-density($density-scale) {}
28+
@mixin _mat-form-field-standard-density($density-scale) {}
2929

3030
@mixin mat-form-field-standard-theme($theme) {
3131
$color: mat-get-color-config($theme);
@@ -36,7 +36,7 @@
3636
@include mat-form-field-standard-color($color);
3737
}
3838
@if $density != null {
39-
@include mat-form-field-standard-density($density);
39+
@include _mat-form-field-standard-density($density);
4040
}
4141
@if $typography != null {
4242
@include mat-form-field-standard-typography($typography);

‎src/material/form-field/_form-field-theme.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,11 @@ $mat-form-field-dedupe: 0;
235235
@include mat-form-field-outline-typography($config);
236236
}
237237

238-
@mixin mat-form-field-density($density-scale) {
239-
@include mat-form-field-legacy-density($density-scale);
240-
@include mat-form-field-standard-density($density-scale);
241-
@include mat-form-field-fill-density($density-scale);
242-
@include mat-form-field-outline-density($density-scale);
238+
@mixin _mat-form-field-density($density-scale) {
239+
@include _mat-form-field-legacy-density($density-scale);
240+
@include _mat-form-field-standard-density($density-scale);
241+
@include _mat-form-field-fill-density($density-scale);
242+
@include _mat-form-field-outline-density($density-scale);
243243
}
244244

245245
@mixin mat-form-field-theme($theme) {
@@ -251,7 +251,7 @@ $mat-form-field-dedupe: 0;
251251
@include mat-form-field-color($color);
252252
}
253253
@if $density != null {
254-
@include mat-form-field-density($density);
254+
@include _mat-form-field-density($density);
255255
}
256256
@if $typography != null {
257257
@include mat-form-field-typography($typography);

‎src/material/grid-list/_grid-list-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
}
1717

18-
@mixin mat-grid-list-density($density-scale) {}
18+
@mixin _mat-grid-list-density($density-scale) {}
1919

2020
@mixin mat-grid-list-theme($theme) {
2121
$color: mat-get-color-config($theme);
@@ -26,7 +26,7 @@
2626
@include mat-grid-list-color($color);
2727
}
2828
@if $density != null {
29-
@include mat-grid-list-density($density);
29+
@include _mat-grid-list-density($density);
3030
}
3131
@if $typography != null {
3232
@include mat-grid-list-typography($typography);

0 commit comments

Comments
 (0)