Skip to content

Commit 072d6d0

Browse files
kvizcarrammalerba
kvizcarra
and
mmalerba
committed
fix(material/slider): Use non-deprecated theme key (#26378)
* fix(material/slider): Use non-deprecated theme key Support for `label-label-text-size` is being [added to MDC Slider](material-components/material-components-web#7946). * build: update MDC dep to latest canary Co-authored-by: Miles Malerba <mmalerba@google.com> (cherry picked from commit 6391fc1)
1 parent d86dd6b commit 072d6d0

File tree

4 files changed

+633
-633
lines changed

4 files changed

+633
-633
lines changed

‎package.json

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -96,53 +96,53 @@
9696
"@bazel/terser": "5.7.2",
9797
"@bazel/worker": "5.7.2",
9898
"@firebase/app-types": "^0.7.0",
99-
"@material/animation": "15.0.0-canary.fd95ca7ef.0",
100-
"@material/auto-init": "15.0.0-canary.fd95ca7ef.0",
101-
"@material/banner": "15.0.0-canary.fd95ca7ef.0",
102-
"@material/base": "15.0.0-canary.fd95ca7ef.0",
103-
"@material/button": "15.0.0-canary.fd95ca7ef.0",
104-
"@material/card": "15.0.0-canary.fd95ca7ef.0",
105-
"@material/checkbox": "15.0.0-canary.fd95ca7ef.0",
106-
"@material/chips": "15.0.0-canary.fd95ca7ef.0",
107-
"@material/circular-progress": "15.0.0-canary.fd95ca7ef.0",
108-
"@material/data-table": "15.0.0-canary.fd95ca7ef.0",
109-
"@material/density": "15.0.0-canary.fd95ca7ef.0",
110-
"@material/dialog": "15.0.0-canary.fd95ca7ef.0",
111-
"@material/dom": "15.0.0-canary.fd95ca7ef.0",
112-
"@material/drawer": "15.0.0-canary.fd95ca7ef.0",
113-
"@material/elevation": "15.0.0-canary.fd95ca7ef.0",
114-
"@material/fab": "15.0.0-canary.fd95ca7ef.0",
115-
"@material/feature-targeting": "15.0.0-canary.fd95ca7ef.0",
116-
"@material/floating-label": "15.0.0-canary.fd95ca7ef.0",
117-
"@material/form-field": "15.0.0-canary.fd95ca7ef.0",
118-
"@material/icon-button": "15.0.0-canary.fd95ca7ef.0",
119-
"@material/image-list": "15.0.0-canary.fd95ca7ef.0",
120-
"@material/layout-grid": "15.0.0-canary.fd95ca7ef.0",
121-
"@material/line-ripple": "15.0.0-canary.fd95ca7ef.0",
122-
"@material/linear-progress": "15.0.0-canary.fd95ca7ef.0",
123-
"@material/list": "15.0.0-canary.fd95ca7ef.0",
124-
"@material/menu": "15.0.0-canary.fd95ca7ef.0",
125-
"@material/menu-surface": "15.0.0-canary.fd95ca7ef.0",
126-
"@material/notched-outline": "15.0.0-canary.fd95ca7ef.0",
127-
"@material/radio": "15.0.0-canary.fd95ca7ef.0",
128-
"@material/ripple": "15.0.0-canary.fd95ca7ef.0",
129-
"@material/rtl": "15.0.0-canary.fd95ca7ef.0",
130-
"@material/segmented-button": "15.0.0-canary.fd95ca7ef.0",
131-
"@material/select": "15.0.0-canary.fd95ca7ef.0",
132-
"@material/shape": "15.0.0-canary.fd95ca7ef.0",
133-
"@material/slider": "15.0.0-canary.fd95ca7ef.0",
134-
"@material/snackbar": "15.0.0-canary.fd95ca7ef.0",
135-
"@material/switch": "15.0.0-canary.fd95ca7ef.0",
136-
"@material/tab": "15.0.0-canary.fd95ca7ef.0",
137-
"@material/tab-bar": "15.0.0-canary.fd95ca7ef.0",
138-
"@material/tab-indicator": "15.0.0-canary.fd95ca7ef.0",
139-
"@material/tab-scroller": "15.0.0-canary.fd95ca7ef.0",
140-
"@material/textfield": "15.0.0-canary.fd95ca7ef.0",
141-
"@material/theme": "15.0.0-canary.fd95ca7ef.0",
142-
"@material/tooltip": "15.0.0-canary.fd95ca7ef.0",
143-
"@material/top-app-bar": "15.0.0-canary.fd95ca7ef.0",
144-
"@material/touch-target": "15.0.0-canary.fd95ca7ef.0",
145-
"@material/typography": "15.0.0-canary.fd95ca7ef.0",
99+
"@material/animation": "15.0.0-canary.684e33d25.0",
100+
"@material/auto-init": "15.0.0-canary.684e33d25.0",
101+
"@material/banner": "15.0.0-canary.684e33d25.0",
102+
"@material/base": "15.0.0-canary.684e33d25.0",
103+
"@material/button": "15.0.0-canary.684e33d25.0",
104+
"@material/card": "15.0.0-canary.684e33d25.0",
105+
"@material/checkbox": "15.0.0-canary.684e33d25.0",
106+
"@material/chips": "15.0.0-canary.684e33d25.0",
107+
"@material/circular-progress": "15.0.0-canary.684e33d25.0",
108+
"@material/data-table": "15.0.0-canary.684e33d25.0",
109+
"@material/density": "15.0.0-canary.684e33d25.0",
110+
"@material/dialog": "15.0.0-canary.684e33d25.0",
111+
"@material/dom": "15.0.0-canary.684e33d25.0",
112+
"@material/drawer": "15.0.0-canary.684e33d25.0",
113+
"@material/elevation": "15.0.0-canary.684e33d25.0",
114+
"@material/fab": "15.0.0-canary.684e33d25.0",
115+
"@material/feature-targeting": "15.0.0-canary.684e33d25.0",
116+
"@material/floating-label": "15.0.0-canary.684e33d25.0",
117+
"@material/form-field": "15.0.0-canary.684e33d25.0",
118+
"@material/icon-button": "15.0.0-canary.684e33d25.0",
119+
"@material/image-list": "15.0.0-canary.684e33d25.0",
120+
"@material/layout-grid": "15.0.0-canary.684e33d25.0",
121+
"@material/line-ripple": "15.0.0-canary.684e33d25.0",
122+
"@material/linear-progress": "15.0.0-canary.684e33d25.0",
123+
"@material/list": "15.0.0-canary.684e33d25.0",
124+
"@material/menu": "15.0.0-canary.684e33d25.0",
125+
"@material/menu-surface": "15.0.0-canary.684e33d25.0",
126+
"@material/notched-outline": "15.0.0-canary.684e33d25.0",
127+
"@material/radio": "15.0.0-canary.684e33d25.0",
128+
"@material/ripple": "15.0.0-canary.684e33d25.0",
129+
"@material/rtl": "15.0.0-canary.684e33d25.0",
130+
"@material/segmented-button": "15.0.0-canary.684e33d25.0",
131+
"@material/select": "15.0.0-canary.684e33d25.0",
132+
"@material/shape": "15.0.0-canary.684e33d25.0",
133+
"@material/slider": "15.0.0-canary.684e33d25.0",
134+
"@material/snackbar": "15.0.0-canary.684e33d25.0",
135+
"@material/switch": "15.0.0-canary.684e33d25.0",
136+
"@material/tab": "15.0.0-canary.684e33d25.0",
137+
"@material/tab-bar": "15.0.0-canary.684e33d25.0",
138+
"@material/tab-indicator": "15.0.0-canary.684e33d25.0",
139+
"@material/tab-scroller": "15.0.0-canary.684e33d25.0",
140+
"@material/textfield": "15.0.0-canary.684e33d25.0",
141+
"@material/theme": "15.0.0-canary.684e33d25.0",
142+
"@material/tooltip": "15.0.0-canary.684e33d25.0",
143+
"@material/top-app-bar": "15.0.0-canary.684e33d25.0",
144+
"@material/touch-target": "15.0.0-canary.684e33d25.0",
145+
"@material/typography": "15.0.0-canary.684e33d25.0",
146146
"@octokit/rest": "18.3.5",
147147
"@rollup/plugin-commonjs": "^21.0.0",
148148
"@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.fd95ca7ef.0"
4+
MDC_PACKAGE_VERSION = "15.0.0-canary.684e33d25.0"
55
TSLIB_PACKAGE_VERSION = "^2.3.0"
66
RXJS_PACKAGE_VERSION = "^6.5.3 || ^7.4.0"
77

‎src/material/slider/_slider-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
.mat-mdc-slider {
5454
@include mdc-slider-theme.theme((
5555
label-label-text-font: mdc-typography.get-font(subtitle2),
56-
label-label-text-font-size: mdc-typography.get-size(subtitle2),
56+
label-label-text-size: mdc-typography.get-size(subtitle2),
5757
label-label-text-line-height: mdc-typography.get-line-height(subtitle2),
5858
label-label-text-tracking: mdc-typography.get-tracking(subtitle2),
5959
label-label-text-weight: mdc-typography.get-weight(subtitle2),

0 commit comments

Comments
 (0)