Skip to content

Commit 837aed7

Browse files
author
Andrew Seguin
committed
fix(multiple): fix density prefixes
1 parent a823ced commit 837aed7

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

src/material/core/tokens/_density.scss

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,41 +26,41 @@ $_density-tokens: (
2626
(mat, chip): (
2727
container-height: (32px, 28px, 24px),
2828
),
29-
(mat, circular-progress): (),
29+
(mat, progress-spinner): (),
3030
(mat, datepicker): (),
3131
(mat, dialog): (),
3232
(mat, divider): (),
33-
(mat, elevated-card): (),
33+
(mat, card-elevated): (),
3434
(mat, expansion): (
3535
header-collapsed-state-height: (48px, 44px, 40px, 36px),
3636
header-expanded-state-height: (64px, 60px, 56px, 48px),
3737
),
38-
(mat, extended-fab): (),
38+
(mat, fab-extended): (),
3939
(mat, fab): (
4040
touch-target-display: (block, block, none, none),
4141
),
4242
(mat, fab-small): (),
43-
(mat, filled-button): (
43+
(mat, button-filled): (
4444
touch-target-display: (block, block, none, none),
4545
container-height: (40px, 36px, 32px, 28px),
4646
),
47-
(mat, filled-text-field): (),
47+
(mat, form-field-filled): (),
4848
(mat, form-field): (
4949
container-height: (56px, 52px, 48px, 44px, 40px, 36px),
5050
filled-label-display: (block, block, none, none, none, none),
5151
container-vertical-padding: (16px, 14px, 12px, 10px, 8px, 6px),
5252
filled-with-label-container-padding-top: (24px, 22px, 12px, 10px, 8px, 6px),
5353
filled-with-label-container-padding-bottom: (8px, 6px, 12px, 10px, 8px, 6px),
5454
),
55-
(mat, full-pseudo-checkbox): (),
55+
(mat, pseudo-checkbox-full): (),
5656
(mat, grid-list): (),
5757
(mat, icon): (),
5858
(mat, icon-button): (
5959
touch-target-display: (block, block, none, none),
6060
// The size caps out at 24px, because anything lower will be smaller than the icon.
6161
state-layer-size: (40px, 36px, 32px, 28px, 24px, 24px),
6262
),
63-
(mat, linear-progress): (),
63+
(mat, progress-bar): (),
6464
(mat, list): (
6565
list-item-leading-icon-start-space: (16px, 12px, 8px, 4px),
6666
list-item-leading-icon-end-space: (16px, 12px, 8px, 4px),
@@ -69,23 +69,23 @@ $_density-tokens: (
6969
list-item-three-line-container-height: (88px, 84px, 80px, 76px, 72px, 56px),
7070
),
7171
(mat, menu): (),
72-
(mat, minimal-pseudo-checkbox): (),
72+
(mat, pseudo-checkbox-minimal): (),
7373
(mat, optgroup): (),
7474
(mat, option): (),
75-
(mat, outlined-button): (
75+
(mat, button-outlined): (
7676
container-height: (40px, 36px, 32px, 28px),
7777
touch-target-display: (block, block, none, none),
7878
),
79-
(mat, outlined-card): (),
80-
(mat, outlined-text-field): (),
79+
(mat, card-outlined): (),
80+
(mat, form-field-outlined): (),
8181
(mat, paginator): (
8282
container-size: (56px, 52px, 48px, 40px),
8383
form-field-container-height: (40px, 40px, 40px, 40px, 40px, 36px),
8484
form-field-container-vertical-padding: (8px, 8px, 8px, 8px, 8px, 6px),
8585
touch-target-display: (block, block, none, none),
8686
),
87-
(mat, plain-tooltip): (),
88-
(mat, protected-button): (
87+
(mat, tooltip): (),
88+
(mat, button-protected): (
8989
touch-target-display: (block, block, none, none),
9090
container-height: (40px, 36px, 32px, 28px),
9191
),
@@ -94,7 +94,7 @@ $_density-tokens: (
9494
state-layer-size: (40px, 36px, 32px, 28px),
9595
),
9696
(mat, ripple): (),
97-
(mat, secondary-navigation-tab): (
97+
(mat, tab): (
9898
container-height: (48px, 44px, 40px, 36px, 32px),
9999
),
100100
(mat, select): (
@@ -105,26 +105,24 @@ $_density-tokens: (
105105
(mat, slider): (),
106106
(mat, snack-bar): (),
107107
(mat, sort): (),
108-
(mat, standard-button-toggle): (
108+
(mat, button-toggle): (
109109
height: (40px, 40px, 40px, 36px, 24px),
110110
),
111111
(mat, stepper): (
112112
header-height: (72px, 68px, 64px, 60px, 42px),
113113
),
114-
(mat, switch): (),
115-
(mat, tab-header): (),
116-
(mat, tab-indicator): (),
114+
(mat, slide-toggle): (),
117115
(mat, table): (
118116
header-container-height: (56px, 52px, 48px, 44px, 40px),
119117
footer-container-height: (52px, 48px, 44px, 40px, 36px),
120118
row-item-container-height: (52px, 48px, 44px, 40px, 36px),
121119
),
122-
(mat, text-button): (
120+
(mat, button-text): (
123121
touch-target-display: (block, block, none, none),
124122
container-height: (40px, 36px, 32px, 28px),
125123
),
126124
(mat, timepicker): (),
127-
(mat, tonal-button): (
125+
(mat, button-tonal): (
128126
container-height: (40px, 36px, 32px, 28px),
129127
touch-target-display: (block, block, none, none),
130128
),

0 commit comments

Comments
 (0)