Skip to content

Commit 40b602f

Browse files
authored
refactor(material/theming): remove underscores from non-mdc density mixins (#20915)
For some components that don't have a corresponding implementation in MDC Web, we added density mixins. We prefixed this with an underscore to prevent premature use. Now we remove the underscore as we're starting rollout in Google.
1 parent 0b01391 commit 40b602f

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

.ng-dev/commit-message.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ export const commitMessage: CommitMessageConfig = {
104104
'material/table',
105105
'material/tabs',
106106
'material/testing',
107+
'material/theming',
107108
'material/toolbar',
108109
'material/tooltip',
109110
'material/tree',

src/material-experimental/mdc-paginator/_paginator-theme.scss

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

56-
@mixin _mat-mdc-paginator-density($config-or-theme) {
56+
@mixin mat-mdc-paginator-density($config-or-theme) {
5757
$density-scale: mat-get-density-config($config-or-theme);
5858
$height: _mat-density-prop-value($mat-paginator-density-config, $density-scale, height);
5959

@@ -75,7 +75,7 @@
7575
@include mat-mdc-paginator-color($color);
7676
}
7777
@if $density != null {
78-
@include _mat-mdc-paginator-density($density);
78+
@include mat-mdc-paginator-density($density);
7979
}
8080
@if $typography != null {
8181
@include mat-mdc-paginator-typography($typography);

src/material/expansion/_expansion-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
}
7575
}
7676

77-
@mixin _mat-expansion-panel-density($config-or-theme) {
77+
@mixin mat-expansion-panel-density($config-or-theme) {
7878
$density-scale: mat-get-density-config($config-or-theme);
7979
$expanded-height: _mat-density-prop-value(
8080
$mat-expansion-panel-header-density-config, $density-scale, expanded-height);
@@ -103,7 +103,7 @@
103103
@include mat-expansion-panel-color($color);
104104
}
105105
@if $density != null {
106-
@include _mat-expansion-panel-density($density);
106+
@include mat-expansion-panel-density($density);
107107
}
108108
@if $typography != null {
109109
@include mat-expansion-panel-typography($typography);

src/material/stepper/_stepper-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
}
135135
}
136136

137-
@mixin _mat-stepper-density($config-or-theme) {
137+
@mixin mat-stepper-density($config-or-theme) {
138138
$density-scale: mat-get-density-config($config-or-theme);
139139
$height: _mat-density-prop-value($mat-stepper-density-config, $density-scale, height);
140140
$vertical-padding: ($height - $mat-stepper-label-header-height) / 2;
@@ -181,7 +181,7 @@
181181
@include mat-stepper-color($color);
182182
}
183183
@if $density != null {
184-
@include _mat-stepper-density($density);
184+
@include mat-stepper-density($density);
185185
}
186186
@if $typography != null {
187187
@include mat-stepper-typography($typography);

src/material/toolbar/_toolbar-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
}
8383
}
8484

85-
@mixin _mat-toolbar-density($config-or-theme) {
85+
@mixin mat-toolbar-density($config-or-theme) {
8686
$density-scale: mat-get-density-config($config-or-theme);
8787
$height-desktop: _mat-density-prop-value(
8888
$mat-toolbar-desktop-density-config, $density-scale, height);
@@ -113,7 +113,7 @@
113113
@include mat-toolbar-color($color);
114114
}
115115
@if $density != null {
116-
@include _mat-toolbar-density($density);
116+
@include mat-toolbar-density($density);
117117
}
118118
@if $typography != null {
119119
@include mat-toolbar-typography($typography);

src/material/tree/_tree-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434
}
3535

36-
@mixin _mat-tree-density($config-or-theme) {
36+
@mixin mat-tree-density($config-or-theme) {
3737
$density-scale: mat-get-density-config($config-or-theme);
3838
$height: _mat-density-prop-value($mat-tree-density-config, $density-scale, height);
3939

@@ -55,7 +55,7 @@
5555
@include mat-tree-color($color);
5656
}
5757
@if $density != null {
58-
@include _mat-tree-density($density);
58+
@include mat-tree-density($density);
5959
}
6060
@if $typography != null {
6161
@include mat-tree-typography($typography);

0 commit comments

Comments
 (0)