Skip to content

Commit

Permalink
refactor(material-experimental): include feature targets in density m…
Browse files Browse the repository at this point in the history
…ixins (#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.
  • Loading branch information
crisbeto authored Jun 15, 2020
1 parent 07a1452 commit 17a7a97
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/material-experimental/mdc-button/_button-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ $mat-button-state-target: '.mdc-button__ripple';
.mat-mdc-raised-button,
.mat-mdc-unelevated-button,
.mat-mdc-outlined-button {
@include mdc-button-density($density-scale);
@include mdc-button-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down Expand Up @@ -334,7 +334,7 @@ $mat-button-state-target: '.mdc-button__ripple';
@mixin mat-mdc-icon-button-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
.mat-mdc-icon-button {
@include mdc-icon-button-density($density-scale);
@include mdc-icon-button-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
@mixin mat-mdc-checkbox-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
.mat-mdc-checkbox .mdc-checkbox {
@include mdc-checkbox-density($density-scale);
@include mdc-checkbox-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-chips/_chips-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
@mixin mat-mdc-chips-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
.mat-mdc-chip {
@include mdc-chip-density($density-scale);
@include mdc-chip-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-radio/_radio-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
@mixin mat-mdc-radio-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
.mat-mdc-radio-button .mdc-radio {
@include mdc-radio-density($density-scale);
@include mdc-radio-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
@mixin mat-mdc-slide-toggle-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
.mat-mdc-slide-toggle .mdc-switch {
@include mdc-switch-density($density-scale);
@include mdc-switch-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-table/_table-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
@mixin mat-mdc-table-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
.mat-mdc-table {
@include mdc-data-table-density($density-scale);
@include mdc-data-table-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-tabs/_tabs-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
@mixin mat-mdc-tabs-density($config-or-theme) {
$density-scale: mat-get-density-config($config-or-theme);
.mat-mdc-tab-header {
@include mdc-tab-bar-density($density-scale);
@include mdc-tab-bar-density($density-scale, $query: $mat-base-styles-query);
}
}

Expand Down

0 comments on commit 17a7a97

Please sign in to comment.