|
11 | 11 | * governing permissions and limitations under the License.
|
12 | 12 | */
|
13 | 13 |
|
14 |
| -.spectrum-ActionBar { |
15 |
| - /* Layout */ |
16 |
| - --spectrum-actionbar-height: var(--spectrum-action-bar-height); |
17 |
| - --spectrum-actionbar-minimum-width: var(--spectrum-action-bar-minimum-width); |
18 |
| - --spectrum-actionbar-corner-radius: var(--spectrum-corner-radius-medium-size-extra-large); |
19 |
| - --spectrum-actionbar-spacing-label-to-action-group: var(--spectrum-action-bar-label-to-action-group-area); |
20 |
| - --spectrum-actionbar-spacing-padding-inline: var(--spectrum-action-bar-edge-to-content-area); |
21 |
| - --spectrum-actionbar-spacing-top-area: var(--spectrum-action-bar-top-to-content-area); |
22 |
| - --spectrum-actionbar-spacing-bottom-area: var(--spectrum-action-bar-bottom-to-content-area); |
23 |
| - --spectrum-actionbar-close-button-to-counter: var(--spectrum-action-bar-close-button-to-counter); |
24 |
| - /* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- defines the field label mod */ |
25 |
| - --spectrum-actionbar-item-counter-line-height: var(--spectrum-line-height-100); |
26 |
| - --spectrum-actionbar-item-counter-color: var(--spectrum-neutral-content-color-default); |
27 |
| - |
28 |
| - /* colors - applied to popover */ |
29 |
| - --spectrum-actionbar-popover-background-color: var(--spectrum-background-elevated-color); |
30 |
| - --spectrum-actionbar-popover-border-color: var(--spectrum-action-bar-border-color); |
31 |
| - |
32 |
| - /* spacing of action bar bottom and horizontal outer edge */ |
33 |
| - --spectrum-actionbar-spacing-outer-edge: var(--spectrum-spacing-300); |
34 |
| - |
35 |
| - /* drop shadow */ |
36 |
| - --spectrum-actionbar-shadow-horizontal: var(--spectrum-drop-shadow-elevated-x); |
37 |
| - --spectrum-actionbar-shadow-vertical: var(--spectrum-drop-shadow-elevated-y); |
38 |
| - --spectrum-actionbar-shadow-blur: var(--spectrum-drop-shadow-elevated-blur); |
39 |
| - --spectrum-actionbar-shadow-color: var(--spectrum-drop-shadow-elevated-color); |
40 |
| - |
41 |
| - &.spectrum-ActionBar--emphasized { |
42 |
| - --spectrum-actionbar-item-counter-color: var(--spectrum-gray-25); |
43 |
| - --spectrum-actionbar-popover-background-color: var(--spectrum-neutral-content-color-default); |
44 |
| - } |
45 |
| - |
46 |
| - /* cjk language support for item counter */ |
47 |
| - &:lang(ja), |
48 |
| - &:lang(zh), |
49 |
| - &:lang(ko) { |
50 |
| - --spectrum-actionbar-item-counter-line-height-cjk: var(--spectrum-cjk-line-height-100); |
51 |
| - } |
52 |
| -} |
53 |
| - |
54 | 14 | /* ActionBar is outer wrapper with nested popover component within */
|
55 | 15 | .spectrum-ActionBar {
|
56 | 16 | /* creates horizontal spacing to edge */
|
57 |
| - padding: 0 var(--spectrum-actionbar-spacing-outer-edge); |
| 17 | + padding: 0 var(--spectrum-spacing-300); |
58 | 18 | inset-block-end: 0;
|
59 | 19 | z-index: 1;
|
60 | 20 |
|
|
68 | 28 | block-size: 0;
|
69 | 29 | opacity: 0;
|
70 | 30 |
|
71 |
| - &.is-open { |
| 31 | + &:where(.is-open) { |
72 | 32 | /* add ActionBar bottom margin to height for correct spacing even when sticky */
|
73 |
| - block-size: calc(var(--spectrum-actionbar-spacing-outer-edge) + var(--spectrum-actionbar-height)); |
| 33 | + block-size: calc(var(--spectrum-spacing-300) + var(--spectrum-action-bar-height)); |
74 | 34 | opacity: 1;
|
75 | 35 | }
|
76 | 36 |
|
77 | 37 | .spectrum-ActionBar-popover {
|
78 | 38 | /* popover is ActionBar height */
|
79 |
| - block-size: var(--spectrum-actionbar-height); |
80 |
| - min-inline-size: var(--spectrum-actionbar-minimum-width); |
| 39 | + block-size: var(--spectrum-action-bar-height); |
| 40 | + min-inline-size: var(--spectrum-action-bar-minimum-width); |
81 | 41 | box-sizing: border-box;
|
82 | 42 | inline-size: 100%;
|
83 | 43 | margin: auto;
|
84 |
| - padding-inline: var(--spectrum-actionbar-spacing-padding-inline); |
85 |
| - padding-block: var(--spectrum-actionbar-spacing-top-area) var(--spectrum-actionbar-spacing-bottom-area); |
| 44 | + padding-inline: var(--spectrum-action-bar-edge-to-content-area); |
| 45 | + padding-block: var(--spectrum-action-bar-top-to-content-area) var(--spectrum-action-bar-bottom-to-content-area); |
86 | 46 |
|
87 | 47 | /* Be relative so our width can be restricted */
|
88 | 48 | position: relative;
|
89 | 49 |
|
90 |
| - border-radius: var(--spectrum-actionbar-corner-radius); |
91 |
| - border-color: var(--highcontrast-actionbar-popover-border-color, var(--spectrum-actionbar-popover-border-color)); |
92 |
| - background-color: var(--spectrum-actionbar-popover-background-color); |
| 50 | + border-radius: var(--spectrum-corner-radius-medium-size-extra-large); |
| 51 | + border-color: var(--spectrum-action-bar-border-color); |
| 52 | + background-color: var(--spectrum-background-elevated-color); |
93 | 53 |
|
94 |
| - filter: drop-shadow(var(--spectrum-actionbar-shadow-horizontal) var(--spectrum-actionbar-shadow-vertical) var(--spectrum-actionbar-shadow-blur) var(--spectrum-actionbar-shadow-color)); |
| 54 | + filter: drop-shadow(var(--spectrum-drop-shadow-elevated-x) var(--spectrum-drop-shadow-elevated-y) var(--spectrum-drop-shadow-elevated-blur) var(--spectrum-drop-shadow-elevated-color)); |
95 | 55 |
|
96 | 56 | /* Let clicks do their thing */
|
97 | 57 | pointer-events: auto;
|
|
104 | 64 |
|
105 | 65 | /* item counter */
|
106 | 66 | .spectrum-FieldLabel {
|
107 |
| - --spectrum-fieldlabel-font-size: var(--spectrum-action-bar-counter-font-size); |
108 |
| - --spectrum-fieldlabel-line-height: var(--spectrum-actionbar-item-counter-line-height); |
| 67 | + font-size: var(--spectrum-action-bar-counter-font-size); |
| 68 | + line-height: var(--spectrum-line-height-100); |
109 | 69 |
|
110 |
| - color: var(--spectrum-actionbar-item-counter-color); |
111 |
| - padding-inline-start: var(--spectrum-actionbar-close-button-to-counter); |
| 70 | + color: var(--spectrum-neutral-content-color-default); |
| 71 | + padding-inline-start: var(--spectrum-action-bar-close-button-to-counter); |
112 | 72 |
|
113 | 73 | /* cjk language support */
|
114 | 74 | &:lang(ja),
|
115 | 75 | &:lang(zh),
|
116 | 76 | &:lang(ko) {
|
117 |
| - line-height: var(--spectrum-actionbar-item-counter-line-height-cjk); |
| 77 | + line-height: var(--spectrum-cjk-line-height-100); |
118 | 78 | }
|
119 | 79 | }
|
120 | 80 |
|
121 | 81 | /* action group */
|
122 | 82 | .spectrum-ActionGroup {
|
123 | 83 | /* align to end by default */
|
124 | 84 | margin-inline-start: auto;
|
125 |
| - padding-inline-start: var(--spectrum-actionbar-spacing-label-to-action-group); /* space between label and action group */ |
| 85 | + padding-inline-start: var(--spectrum-action-bar-label-to-action-group-area); |
| 86 | + } |
| 87 | + |
| 88 | + &:where(.spectrum-ActionBar--emphasized) { |
| 89 | + .spectrum-FieldLabel { |
| 90 | + color: var(--spectrum-gray-25); |
| 91 | + } |
| 92 | + |
| 93 | + .spectrum-ActionBar-popover { |
| 94 | + background-color: var(--spectrum-neutral-content-color-default); |
| 95 | + } |
126 | 96 | }
|
127 | 97 | }
|
128 | 98 |
|
|
143 | 113 |
|
144 | 114 | /* windows high contrast mode */
|
145 | 115 | @media (forced-colors: active) {
|
146 |
| - .spectrum-ActionBar { |
147 |
| - --highcontrast-actionbar-popover-border-color: CanvasText; |
| 116 | + .spectrum-ActionBar-popover { |
| 117 | + border-color: CanvasText; |
148 | 118 | }
|
149 | 119 | }
|
0 commit comments