Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(material/progress-bar): account for new height token #27008

Merged
merged 1 commit into from
Apr 30, 2023
Merged

fix(material/progress-bar): account for new height token #27008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 47 additions & 47 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
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.684e33d25.0",
"@material/auto-init": "15.0.0-canary.684e33d25.0",
"@material/banner": "15.0.0-canary.684e33d25.0",
"@material/base": "15.0.0-canary.684e33d25.0",
"@material/button": "15.0.0-canary.684e33d25.0",
"@material/card": "15.0.0-canary.684e33d25.0",
"@material/checkbox": "15.0.0-canary.684e33d25.0",
"@material/chips": "15.0.0-canary.684e33d25.0",
"@material/circular-progress": "15.0.0-canary.684e33d25.0",
"@material/data-table": "15.0.0-canary.684e33d25.0",
"@material/density": "15.0.0-canary.684e33d25.0",
"@material/dialog": "15.0.0-canary.684e33d25.0",
"@material/dom": "15.0.0-canary.684e33d25.0",
"@material/drawer": "15.0.0-canary.684e33d25.0",
"@material/elevation": "15.0.0-canary.684e33d25.0",
"@material/fab": "15.0.0-canary.684e33d25.0",
"@material/feature-targeting": "15.0.0-canary.684e33d25.0",
"@material/floating-label": "15.0.0-canary.684e33d25.0",
"@material/form-field": "15.0.0-canary.684e33d25.0",
"@material/icon-button": "15.0.0-canary.684e33d25.0",
"@material/image-list": "15.0.0-canary.684e33d25.0",
"@material/layout-grid": "15.0.0-canary.684e33d25.0",
"@material/line-ripple": "15.0.0-canary.684e33d25.0",
"@material/linear-progress": "15.0.0-canary.684e33d25.0",
"@material/list": "15.0.0-canary.684e33d25.0",
"@material/menu": "15.0.0-canary.684e33d25.0",
"@material/menu-surface": "15.0.0-canary.684e33d25.0",
"@material/notched-outline": "15.0.0-canary.684e33d25.0",
"@material/radio": "15.0.0-canary.684e33d25.0",
"@material/ripple": "15.0.0-canary.684e33d25.0",
"@material/rtl": "15.0.0-canary.684e33d25.0",
"@material/segmented-button": "15.0.0-canary.684e33d25.0",
"@material/select": "15.0.0-canary.684e33d25.0",
"@material/shape": "15.0.0-canary.684e33d25.0",
"@material/slider": "15.0.0-canary.684e33d25.0",
"@material/snackbar": "15.0.0-canary.684e33d25.0",
"@material/switch": "15.0.0-canary.684e33d25.0",
"@material/tab": "15.0.0-canary.684e33d25.0",
"@material/tab-bar": "15.0.0-canary.684e33d25.0",
"@material/tab-indicator": "15.0.0-canary.684e33d25.0",
"@material/tab-scroller": "15.0.0-canary.684e33d25.0",
"@material/textfield": "15.0.0-canary.684e33d25.0",
"@material/theme": "15.0.0-canary.684e33d25.0",
"@material/tooltip": "15.0.0-canary.684e33d25.0",
"@material/top-app-bar": "15.0.0-canary.684e33d25.0",
"@material/touch-target": "15.0.0-canary.684e33d25.0",
"@material/typography": "15.0.0-canary.684e33d25.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",
"@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
Open in desktop
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.684e33d25.0"
MDC_PACKAGE_VERSION = "15.0.0-canary.51f9c0c28.0"
TSLIB_PACKAGE_VERSION = "^2.3.0"
RXJS_PACKAGE_VERSION = "^6.5.3 || ^7.4.0"

Expand Down
9 changes: 7 additions & 2 deletions src/material/core/tokens/m2/mdc/_linear-progress.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@ $prefix: (mdc, linear-progress);
// `null` indicates that we are intentionally choosing not to emit a slot or value for the token in
// our CSS.
@function get-unthemable-tokens() {
$height: 4px;

@return (
// The height of the progress bar track.
track-height: 4px
// 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.
bar-and-track-height: $height,
track-height: $height,
);
}

Expand Down
Loading