Skip to content

Commit d6d5433

Browse files
crisbetocrisbeto
committed
refactor(material/core): post-migration fixup
1 parent ecc706b commit d6d5433

File tree

84 files changed

+819
-301
lines changed

Some content is hidden

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

84 files changed

+819
-301
lines changed

‎src/cdk/overlay/_overlay.import.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
@forward 'overlay' hide $dark-backdrop-background, $z-index-overlay, $z-index-overlay-backdrop, $z-index-overlay-container, overlay;
2-
@forward 'overlay' as cdk-* hide $cdk-backdrop-animation-duration, $cdk-backdrop-animation-timing-function, $cdk-dark-backdrop-background;
3-
@forward 'overlay' as cdk-overlay-* hide $cdk-overlay-backdrop-animation-duration, $cdk-overlay-backdrop-animation-timing-function, $cdk-overlay-z-index-overlay, $cdk-overlay-z-index-overlay-backdrop, $cdk-overlay-z-index-overlay-container, cdk-overlay-overlay;
1+
@forward 'overlay' hide $dark-backdrop-background, $z-index-overlay, $z-index-overlay-backdrop,
2+
$z-index-overlay-container, overlay;
3+
@forward 'overlay' as cdk-* hide $cdk-backdrop-animation-duration,
4+
$cdk-backdrop-animation-timing-function, $cdk-dark-backdrop-background;
5+
@forward 'overlay' as cdk-overlay-* hide $cdk-overlay-backdrop-animation-duration,
6+
$cdk-overlay-backdrop-animation-timing-function, $cdk-overlay-z-index-overlay,
7+
$cdk-overlay-z-index-overlay-backdrop, $cdk-overlay-z-index-overlay-container,
8+
cdk-overlay-overlay;

‎src/cdk/text-field/_text-field.import.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
@forward 'text-field' hide $autofill-color-frame-count, autofill-color, text-field;
2-
@forward 'text-field' as cdk-* hide $cdk-autofill-color-frame-count, cdk-autofill-color, cdk-textarea-autosize-measuring-base;
3-
@forward 'text-field' as cdk-text-field-* hide cdk-text-field-text-field, cdk-text-field-textarea-autosize-measuring-base;
2+
@forward 'text-field' as cdk-* hide $cdk-autofill-color-frame-count, cdk-autofill-color,
3+
cdk-textarea-autosize-measuring-base;
4+
@forward 'text-field' as cdk-text-field-* hide cdk-text-field-text-field,
5+
cdk-text-field-textarea-autosize-measuring-base;

‎src/material-experimental/column-resize/_column-resize.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
bottom: 0;
4141
position: absolute;
4242
top: 0;
43-
transition: background variables.$swift-ease-in-duration variables.$swift-ease-in-timing-function;
43+
transition: background
44+
variables.$swift-ease-in-duration
45+
variables.$swift-ease-in-timing-function;
4446
width: 1px;
4547
}
4648

@@ -84,7 +86,9 @@
8486
background: transparent;
8587
cursor: col-resize;
8688
height: 100%;
87-
transition: background variables.$swift-ease-in-duration variables.$swift-ease-in-timing-function;
89+
transition: background
90+
variables.$swift-ease-in-duration
91+
variables.$swift-ease-in-timing-function;
8892
@include vendor-prefixes.user-select(none);
8993
width: 100%;
9094

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
@forward '../mdc-helpers/mdc-helpers.import';
22
@forward '../../material/core/ripple/ripple.import';
33
@forward '../mdc-helpers/mdc-helpers';
4-
@forward 'button-theme' hide color, density, fab-color, fab-density, fab-theme, fab-typography, icon-button-color, icon-button-density, icon-button-theme, icon-button-typography, theme, typography;
5-
@forward 'button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, mat-mdc-color, mat-mdc-density, mat-mdc-mat-button-apply-disabled-style, mat-mdc-mat-button-disabled-background, mat-mdc-mat-button-disabled-color, mat-mdc-mat-button-ripple-ink-color, mat-mdc-theme, mat-mdc-typography;
6-
@forward 'button-theme' as mat-mdc-button-* hide $mat-mdc-button-mat-button-state-target, mat-mdc-button-fab-color, mat-mdc-button-fab-density, mat-mdc-button-fab-theme, mat-mdc-button-fab-typography, mat-mdc-button-icon-button-color, mat-mdc-button-icon-button-density, mat-mdc-button-icon-button-theme, mat-mdc-button-icon-button-typography, mat-mdc-button-mat-button-apply-disabled-style, mat-mdc-button-mat-button-disabled-background, mat-mdc-button-mat-button-disabled-color, mat-mdc-button-mat-button-ripple-ink-color;
4+
@forward 'button-theme' hide color, density, fab-color, fab-density, fab-theme, fab-typography,
5+
icon-button-color, icon-button-density, icon-button-theme, icon-button-typography, theme,
6+
typography;
7+
@forward 'button-theme' as mat-mdc-* hide $mat-mdc-mat-button-state-target, mat-mdc-color,
8+
mat-mdc-density, mat-mdc-mat-button-apply-disabled-style, mat-mdc-mat-button-disabled-background,
9+
mat-mdc-mat-button-disabled-color, mat-mdc-mat-button-ripple-ink-color, mat-mdc-theme,
10+
mat-mdc-typography;
11+
@forward 'button-theme' as mat-mdc-button-* hide $mat-mdc-button-mat-button-state-target,
12+
mat-mdc-button-fab-color, mat-mdc-button-fab-density, mat-mdc-button-fab-theme,
13+
mat-mdc-button-fab-typography, mat-mdc-button-icon-button-color,
14+
mat-mdc-button-icon-button-density, mat-mdc-button-icon-button-theme,
15+
mat-mdc-button-icon-button-typography, mat-mdc-button-mat-button-apply-disabled-style,
16+
mat-mdc-button-mat-button-disabled-background, mat-mdc-button-mat-button-disabled-color,
17+
mat-mdc-button-mat-button-ripple-ink-color;

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

Lines changed: 46 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -63,63 +63,68 @@ $mat-button-state-target: '.mdc-button__ripple';
6363

6464
.mat-mdc-button, .mat-mdc-outlined-button {
6565
&.mat-unthemed {
66-
@include mdc-button-ink-color(mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query);
66+
@include mdc-button-ink-color(mdc-helpers.$mdc-theme-on-surface,
67+
$query: mdc-helpers.$mat-theme-styles-query);
6768
}
6869

6970
&.mat-primary {
7071
@include mdc-button-ink-color(primary, $query: mdc-helpers.$mat-theme-styles-query);
71-
@include mdc-states-base-color(
72-
primary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
72+
@include mdc-states-base-color(primary, $query: mdc-helpers.$mat-theme-styles-query,
73+
$ripple-target: $mat-button-state-target);
7374
@include _mat-button-ripple-ink-color(primary);
7475
}
7576

7677
&.mat-accent {
7778
@include mdc-button-ink-color(secondary, $query: mdc-helpers.$mat-theme-styles-query);
78-
@include mdc-states-base-color(
79-
secondary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
79+
@include mdc-states-base-color(secondary, $query: mdc-helpers.$mat-theme-styles-query,
80+
$ripple-target: $mat-button-state-target);
8081
@include _mat-button-ripple-ink-color(secondary);
8182
}
8283

8384
&.mat-warn {
8485
@include mdc-button-ink-color(error, $query: mdc-helpers.$mat-theme-styles-query);
85-
@include mdc-states-base-color(
86-
error, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
86+
@include mdc-states-base-color(error, $query: mdc-helpers.$mat-theme-styles-query,
87+
$ripple-target: $mat-button-state-target);
8788
@include _mat-button-ripple-ink-color(error);
8889
}
8990
}
9091

9192
.mat-mdc-raised-button,
9293
.mat-mdc-unelevated-button {
9394
&.mat-unthemed {
94-
@include mdc-button-container-fill-color(
95-
mdc-helpers.$mdc-theme-surface, $query: mdc-helpers.$mat-theme-styles-query);
96-
@include mdc-button-ink-color(mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query);
95+
@include mdc-button-container-fill-color(mdc-helpers.$mdc-theme-surface,
96+
$query: mdc-helpers.$mat-theme-styles-query);
97+
@include mdc-button-ink-color(mdc-helpers.$mdc-theme-on-surface,
98+
$query: mdc-helpers.$mat-theme-styles-query);
9799
@include mdc-states-base-color(
98100
mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query,
99101
$ripple-target: $mat-button-state-target);
100102
}
101103

102104
&.mat-primary {
103-
@include mdc-button-container-fill-color(primary, $query: mdc-helpers.$mat-theme-styles-query);
105+
@include mdc-button-container-fill-color(primary,
106+
$query: mdc-helpers.$mat-theme-styles-query);
104107
@include mdc-button-ink-color(on-primary, $query: mdc-helpers.$mat-theme-styles-query);
105-
@include mdc-states-base-color(
106-
on-primary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
108+
@include mdc-states-base-color(on-primary, $query: mdc-helpers.$mat-theme-styles-query,
109+
$ripple-target: $mat-button-state-target);
107110
@include _mat-button-ripple-ink-color(on-primary);
108111
}
109112

110113
&.mat-accent {
111-
@include mdc-button-container-fill-color(secondary, $query: mdc-helpers.$mat-theme-styles-query);
114+
@include mdc-button-container-fill-color(secondary,
115+
$query: mdc-helpers.$mat-theme-styles-query);
112116
@include mdc-button-ink-color(on-secondary, $query: mdc-helpers.$mat-theme-styles-query);
113-
@include mdc-states-base-color(
114-
on-secondary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
117+
@include mdc-states-base-color(on-secondary, $query: mdc-helpers.$mat-theme-styles-query,
118+
$ripple-target: $mat-button-state-target);
115119
@include _mat-button-ripple-ink-color(on-secondary);
116120
}
117121

118122
&.mat-warn {
119-
@include mdc-button-container-fill-color(error, $query: mdc-helpers.$mat-theme-styles-query);
123+
@include mdc-button-container-fill-color(error,
124+
$query: mdc-helpers.$mat-theme-styles-query);
120125
@include mdc-button-ink-color(on-error, $query: mdc-helpers.$mat-theme-styles-query);
121-
@include mdc-states-base-color(
122-
on-error, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
126+
@include mdc-states-base-color(on-error, $query: mdc-helpers.$mat-theme-styles-query,
127+
$ripple-target: $mat-button-state-target);
123128
@include _mat-button-ripple-ink-color(on-error);
124129
}
125130

@@ -130,7 +135,8 @@ $mat-button-state-target: '.mdc-button__ripple';
130135

131136
.mat-mdc-outlined-button {
132137
&.mat-unthemed {
133-
@include mdc-button-outline-color(mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query);
138+
@include mdc-button-outline-color(mdc-helpers.$mdc-theme-on-surface,
139+
$query: mdc-helpers.$mat-theme-styles-query);
134140
}
135141

136142
&.mat-primary {
@@ -214,29 +220,33 @@ $mat-button-state-target: '.mdc-button__ripple';
214220
@include mdc-states-base-color(
215221
mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query,
216222
$ripple-target: $mat-button-state-target);
217-
@include mdc-fab-container-color(mdc-helpers.$mdc-theme-surface, $query: mdc-helpers.$mat-theme-styles-query);
218-
@include mdc-fab-ink-color(mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query);
223+
@include mdc-fab-container-color(mdc-helpers.$mdc-theme-surface,
224+
$query: mdc-helpers.$mat-theme-styles-query);
225+
@include mdc-fab-ink-color(mdc-helpers.$mdc-theme-on-surface,
226+
$query: mdc-helpers.$mat-theme-styles-query);
219227
}
220228

221229
&.mat-primary {
222230
@include mdc-states-base-color(
223-
on-primary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
231+
on-primary, $query: mdc-helpers.$mat-theme-styles-query,
232+
$ripple-target: $mat-button-state-target);
224233
@include mdc-fab-container-color(primary, $query: mdc-helpers.$mat-theme-styles-query);
225234
@include mdc-fab-ink-color(on-primary, $query: mdc-helpers.$mat-theme-styles-query);
226235
@include _mat-button-ripple-ink-color(on-primary);
227236
}
228237

229238
&.mat-accent {
230-
@include mdc-states-base-color(
231-
on-secondary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
239+
@include mdc-states-base-color(on-secondary, $query: mdc-helpers.$mat-theme-styles-query,
240+
$ripple-target: $mat-button-state-target);
232241
@include mdc-fab-container-color(secondary, $query: mdc-helpers.$mat-theme-styles-query);
233242
@include mdc-fab-ink-color(on-secondary, $query: mdc-helpers.$mat-theme-styles-query);
234243
@include _mat-button-ripple-ink-color(on-secondary);
235244
}
236245

237246
&.mat-warn {
238247
@include mdc-states-base-color(
239-
on-error, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
248+
on-error, $query: mdc-helpers.$mat-theme-styles-query,
249+
$ripple-target: $mat-button-state-target);
240250
@include mdc-fab-container-color(error, $query: mdc-helpers.$mat-theme-styles-query);
241251
@include mdc-fab-ink-color(on-error, $query: mdc-helpers.$mat-theme-styles-query);
242252
@include _mat-button-ripple-ink-color(on-error);
@@ -290,29 +300,30 @@ $mat-button-state-target: '.mdc-button__ripple';
290300
$query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
291301

292302
&.mat-unthemed {
293-
@include mdc-states-base-color(
294-
mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query,
295-
$ripple-target: $mat-button-state-target);
296-
@include mdc-icon-button-ink-color(mdc-helpers.$mdc-theme-on-surface, $query: mdc-helpers.$mat-theme-styles-query);
303+
@include mdc-states-base-color(mdc-helpers.$mdc-theme-on-surface,
304+
$query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
305+
@include mdc-icon-button-ink-color(mdc-helpers.$mdc-theme-on-surface,
306+
$query: mdc-helpers.$mat-theme-styles-query);
297307
}
298308

299309
&.mat-primary {
300310
@include mdc-states-base-color(
301-
primary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
311+
primary, $query: mdc-helpers.$mat-theme-styles-query,
312+
$ripple-target: $mat-button-state-target);
302313
@include mdc-icon-button-ink-color(primary, $query: mdc-helpers.$mat-theme-styles-query);
303314
@include _mat-button-ripple-ink-color(primary);
304315
}
305316

306317
&.mat-accent {
307-
@include mdc-states-base-color(
308-
secondary, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
318+
@include mdc-states-base-color(secondary, $query: mdc-helpers.$mat-theme-styles-query,
319+
$ripple-target: $mat-button-state-target);
309320
@include mdc-icon-button-ink-color(secondary, $query: mdc-helpers.$mat-theme-styles-query);
310321
@include _mat-button-ripple-ink-color(secondary);
311322
}
312323

313324
&.mat-warn {
314-
@include mdc-states-base-color(
315-
error, $query: mdc-helpers.$mat-theme-styles-query, $ripple-target: $mat-button-state-target);
325+
@include mdc-states-base-color(error, $query: mdc-helpers.$mat-theme-styles-query,
326+
$ripple-target: $mat-button-state-target);
316327
@include mdc-icon-button-ink-color(error, $query: mdc-helpers.$mat-theme-styles-query);
317328
@include _mat-button-ripple-ink-color(error);
318329
}

‎src/material-experimental/mdc-card/_card-theme.import.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@forward '../mdc-helpers/mdc-helpers.import';
22
@forward '../mdc-helpers/mdc-helpers';
33
@forward 'card-theme' hide color, density, theme, typography;
4-
@forward 'card-theme' as mat-mdc-card-* hide $mat-mdc-card-mdc-card-action-icon-color, $mat-mdc-card-mdc-card-outline-color;
4+
@forward 'card-theme' as mat-mdc-card-* hide $mat-mdc-card-mdc-card-action-icon-color,
5+
$mat-mdc-card-mdc-card-outline-color;

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
@forward '../mdc-helpers/mdc-helpers.import';
22
@forward '../mdc-helpers/mdc-helpers';
3-
@forward 'checkbox-theme' hide color, density, private-checkbox-styles-with-color, theme, typography;
4-
@forward 'checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color, $mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme, mat-mdc-typography;
5-
@forward 'checkbox-theme' as mat-mdc-checkbox-* hide $mat-mdc-checkbox-mdc-checkbox-border-color, $mat-mdc-checkbox-mdc-checkbox-disabled-color, mat-mdc-checkbox-private-checkbox-styles-with-color;
3+
@forward 'checkbox-theme' hide color, density, private-checkbox-styles-with-color, theme,
4+
typography;
5+
@forward 'checkbox-theme' as mat-mdc-* hide $mat-mdc-mdc-checkbox-border-color,
6+
$mat-mdc-mdc-checkbox-disabled-color, mat-mdc-color, mat-mdc-density, mat-mdc-theme,
7+
mat-mdc-typography;
8+
@forward 'checkbox-theme' as mat-mdc-checkbox-* hide $mat-mdc-checkbox-mdc-checkbox-border-color,
9+
$mat-mdc-checkbox-mdc-checkbox-disabled-color,
10+
mat-mdc-checkbox-private-checkbox-styles-with-color;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@forward '../mdc-helpers/mdc-helpers.import';
22
@forward '../mdc-helpers/mdc-helpers';
33
@forward 'chips-theme' hide color, density, theme, typography;
4-
@forward 'chips-theme' as mat-mdc-chips-* hide $mat-mdc-chips-mdc-chips-fill-color-default, $mat-mdc-chips-mdc-chips-icon-color, $mat-mdc-chips-mdc-chips-ink-color-default;
4+
@forward 'chips-theme' as mat-mdc-chips-* hide $mat-mdc-chips-mdc-chips-fill-color-default,
5+
$mat-mdc-chips-mdc-chips-icon-color, $mat-mdc-chips-mdc-chips-ink-color-default;

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,22 @@
3535

3636
&.mat-primary {
3737
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
38-
@include mdc-chip-fill-color-accessible($primary, $query: mdc-helpers.$mat-theme-styles-query);
38+
@include mdc-chip-fill-color-accessible($primary,
39+
$query: mdc-helpers.$mat-theme-styles-query);
3940
}
4041
}
4142

4243
&.mat-accent {
4344
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
44-
@include mdc-chip-fill-color-accessible($accent, $query: mdc-helpers.$mat-theme-styles-query);
45+
@include mdc-chip-fill-color-accessible($accent,
46+
$query: mdc-helpers.$mat-theme-styles-query);
4547
}
4648
}
4749

4850
&.mat-warn {
4951
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
50-
@include mdc-chip-fill-color-accessible($warn, $query: mdc-helpers.$mat-theme-styles-query);
52+
@include mdc-chip-fill-color-accessible($warn,
53+
$query: mdc-helpers.$mat-theme-styles-query);
5154
}
5255
}
5356
}

0 commit comments

Comments
 (0)