Skip to content

Commit e4f1b7d

Browse files
crisbetoandrewseguin
authored andcommitted
refactor(material-experimental): include feature targets in density mixins (#19638)
Includes a feature target when invoking the MDC density mixins. This is consistent with what we're doing everywhere else and could help us exclude some unwanted styles.
1 parent 216f9f2 commit e4f1b7d

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/material-experimental/mdc-button/_button-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ $mat-button-state-target: '.mdc-button__ripple';
178178
.mat-mdc-raised-button,
179179
.mat-mdc-unelevated-button,
180180
.mat-mdc-outlined-button {
181-
@include mdc-button-density($density-scale);
181+
@include mdc-button-density($density-scale, $query: $mat-base-styles-query);
182182
}
183183
}
184184

@@ -334,7 +334,7 @@ $mat-button-state-target: '.mdc-button__ripple';
334334
@mixin mat-mdc-icon-button-density($config-or-theme) {
335335
$density-scale: mat-get-density-config($config-or-theme);
336336
.mat-mdc-icon-button {
337-
@include mdc-icon-button-density($density-scale);
337+
@include mdc-icon-button-density($density-scale, $query: $mat-base-styles-query);
338338
}
339339
}
340340

src/material-experimental/mdc-checkbox/_checkbox-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
@mixin mat-mdc-checkbox-density($config-or-theme) {
8383
$density-scale: mat-get-density-config($config-or-theme);
8484
.mat-mdc-checkbox .mdc-checkbox {
85-
@include mdc-checkbox-density($density-scale);
85+
@include mdc-checkbox-density($density-scale, $query: $mat-base-styles-query);
8686
}
8787
}
8888

src/material-experimental/mdc-chips/_chips-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
@mixin mat-mdc-chips-density($config-or-theme) {
6767
$density-scale: mat-get-density-config($config-or-theme);
6868
.mat-mdc-chip {
69-
@include mdc-chip-density($density-scale);
69+
@include mdc-chip-density($density-scale, $query: $mat-base-styles-query);
7070
}
7171
}
7272

src/material-experimental/mdc-radio/_radio-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
@mixin mat-mdc-radio-density($config-or-theme) {
5050
$density-scale: mat-get-density-config($config-or-theme);
5151
.mat-mdc-radio-button .mdc-radio {
52-
@include mdc-radio-density($density-scale);
52+
@include mdc-radio-density($density-scale, $query: $mat-base-styles-query);
5353
}
5454
}
5555

src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
@mixin mat-mdc-slide-toggle-density($config-or-theme) {
9090
$density-scale: mat-get-density-config($config-or-theme);
9191
.mat-mdc-slide-toggle .mdc-switch {
92-
@include mdc-switch-density($density-scale);
92+
@include mdc-switch-density($density-scale, $query: $mat-base-styles-query);
9393
}
9494
}
9595

src/material-experimental/mdc-table/_table-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@mixin mat-mdc-table-density($config-or-theme) {
5353
$density-scale: mat-get-density-config($config-or-theme);
5454
.mat-mdc-table {
55-
@include mdc-data-table-density($density-scale);
55+
@include mdc-data-table-density($density-scale, $query: $mat-base-styles-query);
5656
}
5757
}
5858

src/material-experimental/mdc-tabs/_tabs-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
@mixin mat-mdc-tabs-density($config-or-theme) {
105105
$density-scale: mat-get-density-config($config-or-theme);
106106
.mat-mdc-tab-header {
107-
@include mdc-tab-bar-density($density-scale);
107+
@include mdc-tab-bar-density($density-scale, $query: $mat-base-styles-query);
108108
}
109109
}
110110

0 commit comments

Comments
 (0)