Skip to content

Commit

Permalink
refactor(material/progress-bar): Add active-indicator-height to unt…
Browse files Browse the repository at this point in the history 
…hemable tokens (angular#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
  • Loading branch information
@kvizcarra
kvizcarra authored May 10, 2023
1 parent f0a5008 commit be7aa13
Show file tree
Hide file tree
Showing 4 changed files with 639 additions and 639 deletions.
96 changes: 48 additions & 48 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"license": "MIT",
"engines": {
"node": ">=14.0.0 <19.0.0",
"node": ">=14.0.0 <20.0.0",
"yarn": "^1.22.17",
"npm": "Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/"
},
Expand Down Expand Up @@ -95,53 +95,53 @@
"@bazel/terser": "5.8.1",
"@bazel/worker": "5.8.1",
"@firebase/app-types": "^0.7.0",
"@material/animation": "15.0.0-canary.51f9c0c28.0",
"@material/auto-init": "15.0.0-canary.51f9c0c28.0",
"@material/banner": "15.0.0-canary.51f9c0c28.0",
"@material/base": "15.0.0-canary.51f9c0c28.0",
"@material/button": "15.0.0-canary.51f9c0c28.0",
"@material/card": "15.0.0-canary.51f9c0c28.0",
"@material/checkbox": "15.0.0-canary.51f9c0c28.0",
"@material/chips": "15.0.0-canary.51f9c0c28.0",
"@material/circular-progress": "15.0.0-canary.51f9c0c28.0",
"@material/data-table": "15.0.0-canary.51f9c0c28.0",
"@material/density": "15.0.0-canary.51f9c0c28.0",
"@material/dialog": "15.0.0-canary.51f9c0c28.0",
"@material/dom": "15.0.0-canary.51f9c0c28.0",
"@material/drawer": "15.0.0-canary.51f9c0c28.0",
"@material/elevation": "15.0.0-canary.51f9c0c28.0",
"@material/fab": "15.0.0-canary.51f9c0c28.0",
"@material/feature-targeting": "15.0.0-canary.51f9c0c28.0",
"@material/floating-label": "15.0.0-canary.51f9c0c28.0",
"@material/form-field": "15.0.0-canary.51f9c0c28.0",
"@material/icon-button": "15.0.0-canary.51f9c0c28.0",
"@material/image-list": "15.0.0-canary.51f9c0c28.0",
"@material/layout-grid": "15.0.0-canary.51f9c0c28.0",
"@material/line-ripple": "15.0.0-canary.51f9c0c28.0",
"@material/linear-progress": "15.0.0-canary.51f9c0c28.0",
"@material/list": "15.0.0-canary.51f9c0c28.0",
"@material/menu": "15.0.0-canary.51f9c0c28.0",
"@material/menu-surface": "15.0.0-canary.51f9c0c28.0",
"@material/notched-outline": "15.0.0-canary.51f9c0c28.0",
"@material/radio": "15.0.0-canary.51f9c0c28.0",
"@material/ripple": "15.0.0-canary.51f9c0c28.0",
"@material/rtl": "15.0.0-canary.51f9c0c28.0",
"@material/segmented-button": "15.0.0-canary.51f9c0c28.0",
"@material/select": "15.0.0-canary.51f9c0c28.0",
"@material/shape": "15.0.0-canary.51f9c0c28.0",
"@material/slider": "15.0.0-canary.51f9c0c28.0",
"@material/snackbar": "15.0.0-canary.51f9c0c28.0",
"@material/switch": "15.0.0-canary.51f9c0c28.0",
"@material/tab": "15.0.0-canary.51f9c0c28.0",
"@material/tab-bar": "15.0.0-canary.51f9c0c28.0",
"@material/tab-indicator": "15.0.0-canary.51f9c0c28.0",
"@material/tab-scroller": "15.0.0-canary.51f9c0c28.0",
"@material/textfield": "15.0.0-canary.51f9c0c28.0",
"@material/theme": "15.0.0-canary.51f9c0c28.0",
"@material/tooltip": "15.0.0-canary.51f9c0c28.0",
"@material/top-app-bar": "15.0.0-canary.51f9c0c28.0",
"@material/touch-target": "15.0.0-canary.51f9c0c28.0",
"@material/typography": "15.0.0-canary.51f9c0c28.0",
"@material/animation": "15.0.0-canary.3b5b55e31.0",
"@material/auto-init": "15.0.0-canary.3b5b55e31.0",
"@material/banner": "15.0.0-canary.3b5b55e31.0",
"@material/base": "15.0.0-canary.3b5b55e31.0",
"@material/button": "15.0.0-canary.3b5b55e31.0",
"@material/card": "15.0.0-canary.3b5b55e31.0",
"@material/checkbox": "15.0.0-canary.3b5b55e31.0",
"@material/chips": "15.0.0-canary.3b5b55e31.0",
"@material/circular-progress": "15.0.0-canary.3b5b55e31.0",
"@material/data-table": "15.0.0-canary.3b5b55e31.0",
"@material/density": "15.0.0-canary.3b5b55e31.0",
"@material/dialog": "15.0.0-canary.3b5b55e31.0",
"@material/dom": "15.0.0-canary.3b5b55e31.0",
"@material/drawer": "15.0.0-canary.3b5b55e31.0",
"@material/elevation": "15.0.0-canary.3b5b55e31.0",
"@material/fab": "15.0.0-canary.3b5b55e31.0",
"@material/feature-targeting": "15.0.0-canary.3b5b55e31.0",
"@material/floating-label": "15.0.0-canary.3b5b55e31.0",
"@material/form-field": "15.0.0-canary.3b5b55e31.0",
"@material/icon-button": "15.0.0-canary.3b5b55e31.0",
"@material/image-list": "15.0.0-canary.3b5b55e31.0",
"@material/layout-grid": "15.0.0-canary.3b5b55e31.0",
"@material/line-ripple": "15.0.0-canary.3b5b55e31.0",
"@material/linear-progress": "15.0.0-canary.3b5b55e31.0",
"@material/list": "15.0.0-canary.3b5b55e31.0",
"@material/menu": "15.0.0-canary.3b5b55e31.0",
"@material/menu-surface": "15.0.0-canary.3b5b55e31.0",
"@material/notched-outline": "15.0.0-canary.3b5b55e31.0",
"@material/radio": "15.0.0-canary.3b5b55e31.0",
"@material/ripple": "15.0.0-canary.3b5b55e31.0",
"@material/rtl": "15.0.0-canary.3b5b55e31.0",
"@material/segmented-button": "15.0.0-canary.3b5b55e31.0",
"@material/select": "15.0.0-canary.3b5b55e31.0",
"@material/shape": "15.0.0-canary.3b5b55e31.0",
"@material/slider": "15.0.0-canary.3b5b55e31.0",
"@material/snackbar": "15.0.0-canary.3b5b55e31.0",
"@material/switch": "15.0.0-canary.3b5b55e31.0",
"@material/tab": "15.0.0-canary.3b5b55e31.0",
"@material/tab-bar": "15.0.0-canary.3b5b55e31.0",
"@material/tab-indicator": "15.0.0-canary.3b5b55e31.0",
"@material/tab-scroller": "15.0.0-canary.3b5b55e31.0",
"@material/textfield": "15.0.0-canary.3b5b55e31.0",
"@material/theme": "15.0.0-canary.3b5b55e31.0",
"@material/tooltip": "15.0.0-canary.3b5b55e31.0",
"@material/top-app-bar": "15.0.0-canary.3b5b55e31.0",
"@material/touch-target": "15.0.0-canary.3b5b55e31.0",
"@material/typography": "15.0.0-canary.3b5b55e31.0",
"@octokit/rest": "18.3.5",
"@rollup/plugin-commonjs": "^21.0.0",
"@rollup/plugin-node-resolve": "^13.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages.bzl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Each individual package uses a placeholder for the version of Angular to ensure they're
# all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
# version for the placeholders.
MDC_PACKAGE_VERSION = "15.0.0-canary.51f9c0c28.0"
MDC_PACKAGE_VERSION = "15.0.0-canary.3b5b55e31.0"
TSLIB_PACKAGE_VERSION = "^2.3.0"
RXJS_PACKAGE_VERSION = "^6.5.3 || ^7.4.0"

Expand Down
8 changes: 5 additions & 3 deletions src/material/core/tokens/m2/mdc/_linear-progress.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ $prefix: (mdc, linear-progress);
$height: 4px;

@return (
// The height of the progress bar track. MDC has two tokens with the goal of having
// `track-height` apply only to the track. In our case both are always the same.
// Specify both while the transition is in progress.
// The height of the progress bar. MDC has three tokens with the goal
// of having `track-height` apply only to the track. In our case, all three
// are always the same. Specify all three while the transition is in
// progress.
active-indicator-height: $height,
bar-and-track-height: $height,
track-height: $height,
);
Expand Down
Loading

0 comments on commit be7aa13

Please sign in to comment.