Skip to content

Commit c1776e1

Browse files
crisbetojelbourn
authored andcommitted
build: update to latest MDC version (#17076)
Updates to the latest alpha version of MDC which includes some of the changes we need for the progress bar. Also fixes a breaking change in the tab styles.
1 parent 75591f7 commit c1776e1

File tree

5 files changed

+509
-483
lines changed

5 files changed

+509
-483
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@types/youtube": "^0.0.38",
5252
"@webcomponents/custom-elements": "^1.1.0",
5353
"core-js": "^2.6.1",
54-
"material-components-web": "^4.0.0-alpha.0",
54+
"material-components-web": "^4.0.0-canary.e851d4f40.0",
5555
"rxjs": "^6.5.2",
5656
"systemjs": "0.19.43",
5757
"tsickle": "^0.35.0",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
@include mdc-button-without-ripple($query: $mat-base-styles-query);
99

1010
.mat-mdc-button, .mat-mdc-unelevated-button, .mat-mdc-raised-button, .mat-mdc-outlined-button {
11+
@include mdc-button-density(0, $mat-base-styles-query);
12+
1113
// Add an outline to make buttons more visible in high contrast mode. Stroked buttons
1214
// don't need a special look in high-contrast mode, because those already have an outline.
1315
@include cdk-high-contrast {

src/material-experimental/mdc-helpers/BUILD.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ sass_library(
3838
"@npm//:node_modules/@material/checkbox/_variables.scss",
3939
"@npm//:node_modules/@material/chips/_mixins.scss",
4040
"@npm//:node_modules/@material/chips/_variables.scss",
41+
"@npm//:node_modules/@material/data-table/_mixins.scss",
42+
"@npm//:node_modules/@material/data-table/_variables.scss",
43+
"@npm//:node_modules/@material/density/_functions.scss",
44+
"@npm//:node_modules/@material/density/_variables.scss",
4145
"@npm//:node_modules/@material/dialog/_mixins.scss",
4246
"@npm//:node_modules/@material/dialog/_variables.scss",
4347
"@npm//:node_modules/@material/drawer/_mixins.scss",
@@ -82,6 +86,7 @@ sass_library(
8286
"@npm//:node_modules/@material/ripple/_mixins.scss",
8387
"@npm//:node_modules/@material/ripple/_variables.scss",
8488
"@npm//:node_modules/@material/rtl/_mixins.scss",
89+
"@npm//:node_modules/@material/rtl/_variables.scss",
8590
"@npm//:node_modules/@material/select/_functions.scss",
8691
"@npm//:node_modules/@material/select/_keyframes.scss",
8792
"@npm//:node_modules/@material/select/_mixins.scss",
@@ -101,7 +106,9 @@ sass_library(
101106
"@npm//:node_modules/@material/switch/_mixins.scss",
102107
"@npm//:node_modules/@material/switch/_variables.scss",
103108
"@npm//:node_modules/@material/tab-bar/_mixins.scss",
109+
"@npm//:node_modules/@material/tab-bar/_variables.scss",
104110
"@npm//:node_modules/@material/tab-indicator/_mixins.scss",
111+
"@npm//:node_modules/@material/tab-scroller/_mixins.scss",
105112
"@npm//:node_modules/@material/tab/_mixins.scss",
106113
"@npm//:node_modules/@material/tab/_variables.scss",
107114
"@npm//:node_modules/@material/textfield/_functions.scss",

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
@import '@material/ripple/variables';
2+
@import '@material/tab/variables';
3+
@import '@material/tab/mixins';
24
@import '../../material/core/style/variables';
35
@import '../../material/core/style/noop-animation';
46
@import '../../material/core/style/vendor-prefixes';
57
@import '../../cdk/a11y/a11y';
8+
@import '../mdc-helpers/mdc-helpers';
69

710
$mat-tab-animation-duration: 500ms !default;
811

912
@mixin mat-mdc-tab {
1013
&.mdc-tab {
14+
// This is usually included by MDC's tab bar, however we don't
15+
// use it because we implement our own pagination.
16+
@include mdc-tab-height($mdc-tab-height, $mat-base-styles-query);
17+
1118
// MDC's tabs stretch to fit the header by default, whereas stretching on our current ones
1219
// is an opt-in behavior. Also technically we don't need to combine the two classes, but
1320
// we need the extra specificity to avoid issues with CSS insertion order.

0 commit comments

Comments
 (0)