Skip to content

Commit be7aa13

Browse files
authored
refactor(material/progress-bar): Add active-indicator-height to unthemable tokens (#27047)
* build: increase max node engine version Node is currently at 20.1.0 and my instance of GitHub Codespaces is using 19.9.0. * build: update MDC canary version * refactor(material/progress-bar): Add `active-indicator-height` to unthemable tokens
1 parent f0a5008 commit be7aa13

File tree

4 files changed

+639
-639
lines changed

4 files changed

+639
-639
lines changed

package.json

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"license": "MIT",
1111
"engines": {
12-
"node": ">=14.0.0 <19.0.0",
12+
"node": ">=14.0.0 <20.0.0",
1313
"yarn": "^1.22.17",
1414
"npm": "Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/"
1515
},
@@ -95,53 +95,53 @@
9595
"@bazel/terser": "5.8.1",
9696
"@bazel/worker": "5.8.1",
9797
"@firebase/app-types": "^0.7.0",
98-
"@material/animation": "15.0.0-canary.51f9c0c28.0",
99-
"@material/auto-init": "15.0.0-canary.51f9c0c28.0",
100-
"@material/banner": "15.0.0-canary.51f9c0c28.0",
101-
"@material/base": "15.0.0-canary.51f9c0c28.0",
102-
"@material/button": "15.0.0-canary.51f9c0c28.0",
103-
"@material/card": "15.0.0-canary.51f9c0c28.0",
104-
"@material/checkbox": "15.0.0-canary.51f9c0c28.0",
105-
"@material/chips": "15.0.0-canary.51f9c0c28.0",
106-
"@material/circular-progress": "15.0.0-canary.51f9c0c28.0",
107-
"@material/data-table": "15.0.0-canary.51f9c0c28.0",
108-
"@material/density": "15.0.0-canary.51f9c0c28.0",
109-
"@material/dialog": "15.0.0-canary.51f9c0c28.0",
110-
"@material/dom": "15.0.0-canary.51f9c0c28.0",
111-
"@material/drawer": "15.0.0-canary.51f9c0c28.0",
112-
"@material/elevation": "15.0.0-canary.51f9c0c28.0",
113-
"@material/fab": "15.0.0-canary.51f9c0c28.0",
114-
"@material/feature-targeting": "15.0.0-canary.51f9c0c28.0",
115-
"@material/floating-label": "15.0.0-canary.51f9c0c28.0",
116-
"@material/form-field": "15.0.0-canary.51f9c0c28.0",
117-
"@material/icon-button": "15.0.0-canary.51f9c0c28.0",
118-
"@material/image-list": "15.0.0-canary.51f9c0c28.0",
119-
"@material/layout-grid": "15.0.0-canary.51f9c0c28.0",
120-
"@material/line-ripple": "15.0.0-canary.51f9c0c28.0",
121-
"@material/linear-progress": "15.0.0-canary.51f9c0c28.0",
122-
"@material/list": "15.0.0-canary.51f9c0c28.0",
123-
"@material/menu": "15.0.0-canary.51f9c0c28.0",
124-
"@material/menu-surface": "15.0.0-canary.51f9c0c28.0",
125-
"@material/notched-outline": "15.0.0-canary.51f9c0c28.0",
126-
"@material/radio": "15.0.0-canary.51f9c0c28.0",
127-
"@material/ripple": "15.0.0-canary.51f9c0c28.0",
128-
"@material/rtl": "15.0.0-canary.51f9c0c28.0",
129-
"@material/segmented-button": "15.0.0-canary.51f9c0c28.0",
130-
"@material/select": "15.0.0-canary.51f9c0c28.0",
131-
"@material/shape": "15.0.0-canary.51f9c0c28.0",
132-
"@material/slider": "15.0.0-canary.51f9c0c28.0",
133-
"@material/snackbar": "15.0.0-canary.51f9c0c28.0",
134-
"@material/switch": "15.0.0-canary.51f9c0c28.0",
135-
"@material/tab": "15.0.0-canary.51f9c0c28.0",
136-
"@material/tab-bar": "15.0.0-canary.51f9c0c28.0",
137-
"@material/tab-indicator": "15.0.0-canary.51f9c0c28.0",
138-
"@material/tab-scroller": "15.0.0-canary.51f9c0c28.0",
139-
"@material/textfield": "15.0.0-canary.51f9c0c28.0",
140-
"@material/theme": "15.0.0-canary.51f9c0c28.0",
141-
"@material/tooltip": "15.0.0-canary.51f9c0c28.0",
142-
"@material/top-app-bar": "15.0.0-canary.51f9c0c28.0",
143-
"@material/touch-target": "15.0.0-canary.51f9c0c28.0",
144-
"@material/typography": "15.0.0-canary.51f9c0c28.0",
98+
"@material/animation": "15.0.0-canary.3b5b55e31.0",
99+
"@material/auto-init": "15.0.0-canary.3b5b55e31.0",
100+
"@material/banner": "15.0.0-canary.3b5b55e31.0",
101+
"@material/base": "15.0.0-canary.3b5b55e31.0",
102+
"@material/button": "15.0.0-canary.3b5b55e31.0",
103+
"@material/card": "15.0.0-canary.3b5b55e31.0",
104+
"@material/checkbox": "15.0.0-canary.3b5b55e31.0",
105+
"@material/chips": "15.0.0-canary.3b5b55e31.0",
106+
"@material/circular-progress": "15.0.0-canary.3b5b55e31.0",
107+
"@material/data-table": "15.0.0-canary.3b5b55e31.0",
108+
"@material/density": "15.0.0-canary.3b5b55e31.0",
109+
"@material/dialog": "15.0.0-canary.3b5b55e31.0",
110+
"@material/dom": "15.0.0-canary.3b5b55e31.0",
111+
"@material/drawer": "15.0.0-canary.3b5b55e31.0",
112+
"@material/elevation": "15.0.0-canary.3b5b55e31.0",
113+
"@material/fab": "15.0.0-canary.3b5b55e31.0",
114+
"@material/feature-targeting": "15.0.0-canary.3b5b55e31.0",
115+
"@material/floating-label": "15.0.0-canary.3b5b55e31.0",
116+
"@material/form-field": "15.0.0-canary.3b5b55e31.0",
117+
"@material/icon-button": "15.0.0-canary.3b5b55e31.0",
118+
"@material/image-list": "15.0.0-canary.3b5b55e31.0",
119+
"@material/layout-grid": "15.0.0-canary.3b5b55e31.0",
120+
"@material/line-ripple": "15.0.0-canary.3b5b55e31.0",
121+
"@material/linear-progress": "15.0.0-canary.3b5b55e31.0",
122+
"@material/list": "15.0.0-canary.3b5b55e31.0",
123+
"@material/menu": "15.0.0-canary.3b5b55e31.0",
124+
"@material/menu-surface": "15.0.0-canary.3b5b55e31.0",
125+
"@material/notched-outline": "15.0.0-canary.3b5b55e31.0",
126+
"@material/radio": "15.0.0-canary.3b5b55e31.0",
127+
"@material/ripple": "15.0.0-canary.3b5b55e31.0",
128+
"@material/rtl": "15.0.0-canary.3b5b55e31.0",
129+
"@material/segmented-button": "15.0.0-canary.3b5b55e31.0",
130+
"@material/select": "15.0.0-canary.3b5b55e31.0",
131+
"@material/shape": "15.0.0-canary.3b5b55e31.0",
132+
"@material/slider": "15.0.0-canary.3b5b55e31.0",
133+
"@material/snackbar": "15.0.0-canary.3b5b55e31.0",
134+
"@material/switch": "15.0.0-canary.3b5b55e31.0",
135+
"@material/tab": "15.0.0-canary.3b5b55e31.0",
136+
"@material/tab-bar": "15.0.0-canary.3b5b55e31.0",
137+
"@material/tab-indicator": "15.0.0-canary.3b5b55e31.0",
138+
"@material/tab-scroller": "15.0.0-canary.3b5b55e31.0",
139+
"@material/textfield": "15.0.0-canary.3b5b55e31.0",
140+
"@material/theme": "15.0.0-canary.3b5b55e31.0",
141+
"@material/tooltip": "15.0.0-canary.3b5b55e31.0",
142+
"@material/top-app-bar": "15.0.0-canary.3b5b55e31.0",
143+
"@material/touch-target": "15.0.0-canary.3b5b55e31.0",
144+
"@material/typography": "15.0.0-canary.3b5b55e31.0",
145145
"@octokit/rest": "18.3.5",
146146
"@rollup/plugin-commonjs": "^21.0.0",
147147
"@rollup/plugin-node-resolve": "^13.1.3",

packages.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Each individual package uses a placeholder for the version of Angular to ensure they're
22
# all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
33
# version for the placeholders.
4-
MDC_PACKAGE_VERSION = "15.0.0-canary.51f9c0c28.0"
4+
MDC_PACKAGE_VERSION = "15.0.0-canary.3b5b55e31.0"
55
TSLIB_PACKAGE_VERSION = "^2.3.0"
66
RXJS_PACKAGE_VERSION = "^6.5.3 || ^7.4.0"
77

src/material/core/tokens/m2/mdc/_linear-progress.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ $prefix: (mdc, linear-progress);
1717
$height: 4px;
1818

1919
@return (
20-
// The height of the progress bar track. MDC has two tokens with the goal of having
21-
// `track-height` apply only to the track. In our case both are always the same.
22-
// Specify both while the transition is in progress.
20+
// The height of the progress bar. MDC has three tokens with the goal
21+
// of having `track-height` apply only to the track. In our case, all three
22+
// are always the same. Specify all three while the transition is in
23+
// progress.
24+
active-indicator-height: $height,
2325
bar-and-track-height: $height,
2426
track-height: $height,
2527
);

0 commit comments

Comments
 (0)