Skip to content

Commit 7fe8381

Browse files
devversionandrewseguin
authored andcommitted
fix(material-experimental/mdc-form-field): do not include outline structure styles in theme
Fixes that the outline structure styles are accidentally included in the theme file.
1 parent 09849d8 commit 7fe8381

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/material-experimental/mdc-form-field/_mdc-form-field.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
@include _mdc-text-field-refresh-theme-variables() {
3737
@include mdc-text-field-without-ripple($query: $mat-theme-styles-query);
3838
@include mdc-floating-label-core-styles($query: $mat-theme-styles-query);
39-
@include mdc-notched-outline-core-styles($query: $mat-base-styles-query);
39+
@include mdc-notched-outline-core-styles($query: $mat-theme-styles-query);
4040
@include mdc-line-ripple-core-styles($query: $mat-theme-styles-query);
4141
@include _mat-form-field-subscript-theme();
4242
@include _mat-form-field-focus-overlay-theme();
@@ -56,7 +56,8 @@
5656
@include mat-using-mdc-typography($config) {
5757
@include mdc-text-field-without-ripple($query: $mat-typography-styles-query);
5858
@include mdc-floating-label-core-styles($query: $mat-typography-styles-query);
59-
@include mdc-text-field-core-styles($query: $mat-typography-styles-query);
59+
@include mdc-notched-outline-core-styles($query: $mat-typography-styles-query);
60+
@include mdc-line-ripple-core-styles($query: $mat-typography-styles-query);
6061
@include _mat-form-field-subscript-typography($config);
6162
}
6263
}

src/material-experimental/mdc-form-field/form-field.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
// Base styles for MDC text-field, notched-outline, floating label and line-ripple.
1010
@include mdc-text-field-without-ripple($query: $mat-base-styles-without-animation-query);
11-
@include mdc-notched-outline-core-styles($query: $mat-base-styles-without-animation-query);
1211
@include mdc-floating-label-core-styles($query: $mat-base-styles-without-animation-query);
12+
@include mdc-notched-outline-core-styles($query: $mat-base-styles-without-animation-query);
1313
@include mdc-line-ripple-core-styles($query: $mat-base-styles-without-animation-query);
1414

1515
// MDC text-field overwrites.
@@ -58,7 +58,7 @@
5858
// we only activate the animation styles if animations are not explicitly disabled.
5959
.mat-mdc-form-field:not(.mat-form-field-no-animations) {
6060
@include mdc-text-field-without-ripple($query: animation);
61-
@include mdc-notched-outline-core-styles($query: animation);
6261
@include mdc-floating-label-core-styles($query: animation);
62+
@include mdc-notched-outline-core-styles($query: animation);
6363
@include mdc-line-ripple-core-styles($query: animation);
6464
}

0 commit comments

Comments
 (0)