@@ -16,18 +16,22 @@ governing permissions and limitations under the License.
16
16
/* Interactions with overbackground button should match background. Not a DNA token, overridden in WHCM. */
17
17
--spectrum-button-over-background-color : inherit;
18
18
19
+ --spectrum-actionbutton-background-color-selected : var (--spectrum-alias-toggle-color-selected );
20
+ --spectrum-actionbutton-background-color-selected-hover : var (--spectrum-alias-toggle-color-selected-hover );
21
+ --spectrum-actionbutton-background-color-selected-key-focus : var (--spectrum-alias-toggle-color-selected-key-focus );
22
+ --spectrum-actionbutton-background-color-selected-down : var (--spectrum-alias-toggle-color-selected-down );
19
23
--spectrum-actionbutton-border-color-selected : var (--spectrum-actionbutton-background-color-selected );
20
24
--spectrum-actionbutton-border-color-selected-hover : var (--spectrum-actionbutton-background-color-selected-hover );
21
25
--spectrum-actionbutton-border-color-selected-key-focus : var (--spectrum-actionbutton-background-color-selected-key-focus );
22
26
--spectrum-actionbutton-border-color-selected-down : var (--spectrum-actionbutton-background-color-selected-down );
23
- --spectrum-actionbutton-text-color-selected : white ;
24
- --spectrum-actionbutton-text-color-selected-hover : white ;
25
- --spectrum-actionbutton-text-color-selected-key-focus : white ;
26
- --spectrum-actionbutton-text-color-selected-down : white ;
27
- --spectrum-actionbutton-icon-color-selected : white ;
28
- --spectrum-actionbutton-icon-color-selected-hover : white ;
29
- --spectrum-actionbutton-icon-color-selected-key-focus : white ;
30
- --spectrum-actionbutton-icon-color-selected-down : white ;
27
+ --spectrum-actionbutton-text-color-selected : var ( --spectrum-gray-50 ) ;
28
+ --spectrum-actionbutton-text-color-selected-hover : var ( --spectrum-gray-50 ) ;
29
+ --spectrum-actionbutton-text-color-selected-key-focus : var ( --spectrum-gray-50 ) ;
30
+ --spectrum-actionbutton-text-color-selected-down : var ( --spectrum-gray-50 ) ;
31
+ --spectrum-actionbutton-icon-color-selected : var ( --spectrum-gray-50 ) ;
32
+ --spectrum-actionbutton-icon-color-selected-hover : var ( --spectrum-gray-50 ) ;
33
+ --spectrum-actionbutton-icon-color-selected-key-focus : var ( --spectrum-gray-50 ) ;
34
+ --spectrum-actionbutton-icon-color-selected-down : var ( --spectrum-gray-50 ) ;
31
35
32
36
--spectrum-actionbutton-emphasized-background-color-selected : var (--spectrum-accent-background-color-default );
33
37
--spectrum-actionbutton-emphasized-background-color-selected-hover : var (--spectrum-accent-background-color-hover );
@@ -112,31 +116,27 @@ governing permissions and limitations under the License.
112
116
/* high contrast overrides all colors */
113
117
/* xvar is passed through. without it, some postcss plugin breaks variable fallback... */
114
118
background-color : xvar (--spectrum-high-contrast-button-text , var (--spectrum-button-color ));
115
- border-color : xvar ( --spectrum-high-contrast-button-text , var ( --spectrum-button-color )) ;
119
+ border-color : transparent ;
116
120
color : xvar (--spectrum-high-contrast-button-face , var (--spectrum-button-text-color ));
117
121
118
122
& : hover {
119
123
background-color : xvar (--spectrum-high-contrast-highlight , var (--spectrum-button-color-hover ));
120
- border-color : xvar (--spectrum-high-contrast-highlight , var (--spectrum-button-color-hover ));
121
124
color : xvar (--spectrum-high-contrast-button-face , var (--spectrum-button-text-color-hover ));
122
125
}
123
126
124
127
& : focus-ring {
125
128
background-color : xvar (--spectrum-high-contrast-highlight , var (--spectrum-button-color-key-focus ));
126
- border-color : xvar (--spectrum-high-contrast-highlight , var (--spectrum-button-color-key-focus ));
127
129
color : xvar (--spectrum-high-contrast-button-face , var (--spectrum-button-text-color-key-focus ));
128
130
}
129
131
130
132
& .is-active {
131
133
background-color : xvar (--spectrum-high-contrast-highlight , var (--spectrum-button-color-down ));
132
- border-color : xvar (--spectrum-high-contrast-highlight , var (--spectrum-button-color-down ));
133
134
color : xvar (--spectrum-high-contrast-button-face , var (--spectrum-button-text-color-down ));
134
135
}
135
136
136
137
& : disabled ,
137
138
& .is-disabled {
138
139
background-color : xvar (--spectrum-high-contrast-button-face , var (--spectrum-button-color-disabled ));
139
- border-color : xvar (--spectrum-high-contrast-gray-text , var (--spectrum-button-color-disabled ));
140
140
color : xvar (--spectrum-high-contrast-gray-text , var (--spectrum-button-text-color-disabled ));
141
141
}
142
142
}
@@ -194,34 +194,50 @@ governing permissions and limitations under the License.
194
194
--spectrum-button-text-color : black;
195
195
--spectrum-button-text-color-disabled : rgba (255 , 255 , 255 , 0.55 );
196
196
}
197
+
198
+ & [data-style = outline ] {
199
+ --spectrum-button-color : rgba (255 , 255 , 255 , 0.9 );
200
+ --spectrum-button-color-hover : white;
201
+ --spectrum-button-color-down : white;
202
+ --spectrum-button-color-key-focus : white;
203
+ --spectrum-button-color-disabled : rgba (255 , 255 , 255 , 0.25 );
204
+ --spectrum-button-text-color : white;
205
+ --spectrum-button-text-color-hover : white;
206
+ --spectrum-button-text-color-down : white;
207
+ --spectrum-button-text-color-key-focus : white;
208
+ --spectrum-button-text-color-disabled : rgba (255 , 255 , 255 , 0.55 );
209
+ --spectrum-button-background-color-hover : rgba (255 , 255 , 255 , 0.1 );
210
+ --spectrum-button-background-color-down : rgba (255 , 255 , 255 , 0.15 );
211
+ --spectrum-button-background-color-key-focus : rgba (255 , 255 , 255 , 0.1 );
212
+ }
197
213
}
198
214
199
215
& [data-variant = secondary ] {
200
216
& [data-style = fill ] {
201
- --spectrum-button-color : rgba (255 , 255 , 255 , 0.1 );
202
- --spectrum-button-color-hover : rgba (255 , 255 , 255 , 0.25 );
203
- --spectrum-button-color-down : rgba (255 , 255 , 255 , 0.4 );
204
- --spectrum-button-color-key-focus : rgba (255 , 255 , 255 , 0.25 );
217
+ --spectrum-button-color : rgba (255 , 255 , 255 , 0.07 );
218
+ --spectrum-button-color-hover : rgba (255 , 255 , 255 , 0.1 );
219
+ --spectrum-button-color-down : rgba (255 , 255 , 255 , 0.15 );
220
+ --spectrum-button-color-key-focus : rgba (255 , 255 , 255 , 0.1 );
205
221
--spectrum-button-color-disabled : rgba (255 , 255 , 255 , 0.1 );
206
222
--spectrum-button-text-color : white;
207
223
--spectrum-button-text-color-disabled : rgba (255 , 255 , 255 , 0.55 );
208
224
}
209
- }
210
225
211
- & [data-style = outline ] {
212
- --spectrum-button-color : rgba (255 , 255 , 255 , 0.25 );
213
- --spectrum-button-color-hover : rgba (255 , 255 , 255 , 0.4 );
214
- --spectrum-button-color-down : rgba (255 , 255 , 255 , 0.55 );
215
- --spectrum-button-color-key-focus : rgba (255 , 255 , 255 , 0.4 );
216
- --spectrum-button-color-disabled : rgba (255 , 255 , 255 , 0.25 );
217
- --spectrum-button-text-color : white;
218
- --spectrum-button-text-color-hover : white;
219
- --spectrum-button-text-color-down : white;
220
- --spectrum-button-text-color-key-focus : white;
221
- --spectrum-button-text-color-disabled : rgba (255 , 255 , 255 , 0.55 );
222
- --spectrum-button-background-color-hover : rgba (255 , 255 , 255 , 0.25 );
223
- --spectrum-button-background-color-down : rgba (255 , 255 , 255 , 0.4 );
224
- --spectrum-button-background-color-key-focus : rgba (255 , 255 , 255 , 0.25 );
226
+ & [data-style = outline ] {
227
+ --spectrum-button-color : rgba (255 , 255 , 255 , 0.25 );
228
+ --spectrum-button-color-hover : rgba (255 , 255 , 255 , 0.4 );
229
+ --spectrum-button-color-down : rgba (255 , 255 , 255 , 0.55 );
230
+ --spectrum-button-color-key-focus : rgba (255 , 255 , 255 , 0.4 );
231
+ --spectrum-button-color-disabled : rgba (255 , 255 , 255 , 0.25 );
232
+ --spectrum-button-text-color : white;
233
+ --spectrum-button-text-color-hover : white;
234
+ --spectrum-button-text-color-down : white;
235
+ --spectrum-button-text-color-key-focus : white;
236
+ --spectrum-button-text-color-disabled : rgba (255 , 255 , 255 , 0.55 );
237
+ --spectrum-button-background-color-hover : rgba (255 , 255 , 255 , 0.1 );
238
+ --spectrum-button-background-color-down : rgba (255 , 255 , 255 , 0.15 );
239
+ --spectrum-button-background-color-key-focus : rgba (255 , 255 , 255 , 0.1 );
240
+ }
225
241
}
226
242
}
227
243
@@ -252,18 +268,18 @@ governing permissions and limitations under the License.
252
268
--spectrum-button-text-color-down : black;
253
269
--spectrum-button-text-color-key-focus : black;
254
270
--spectrum-button-text-color-disabled : rgba (0 , 0 , 0 , 0.55 );
255
- --spectrum-button-background-color-hover : rgba (0 , 0 , 0 , 0.25 );
256
- --spectrum-button-background-color-down : rgba (0 , 0 , 0 , 0.4 );
257
- --spectrum-button-background-color-key-focus : rgba (0 , 0 , 0 , 0.25 );
271
+ --spectrum-button-background-color-hover : rgba (0 , 0 , 0 , 0.1 );
272
+ --spectrum-button-background-color-down : rgba (0 , 0 , 0 , 0.15 );
273
+ --spectrum-button-background-color-key-focus : rgba (0 , 0 , 0 , 0.1 );
258
274
}
259
275
}
260
276
261
277
& [data-variant = secondary ] {
262
278
& [data-style = fill ] {
263
- --spectrum-button-color : rgba (0 , 0 , 0 , 0.1 );
264
- --spectrum-button-color-hover : rgba (0 , 0 , 0 , 0.25 );
265
- --spectrum-button-color-down : rgba (0 , 0 , 0 , 0.4 );
266
- --spectrum-button-color-key-focus : rgba (0 , 0 , 0 , 0.25 );
279
+ --spectrum-button-color : rgba (0 , 0 , 0 , 0.07 );
280
+ --spectrum-button-color-hover : rgba (0 , 0 , 0 , 0.1 );
281
+ --spectrum-button-color-down : rgba (0 , 0 , 0 , 0.15 );
282
+ --spectrum-button-color-key-focus : rgba (0 , 0 , 0 , 0.1 );
267
283
--spectrum-button-color-disabled : rgba (0 , 0 , 0 , 0.1 );
268
284
--spectrum-button-text-color : black;
269
285
--spectrum-button-text-color-disabled : rgba (0 , 0 , 0 , 0.55 );
@@ -280,9 +296,9 @@ governing permissions and limitations under the License.
280
296
--spectrum-button-text-color-down : black;
281
297
--spectrum-button-text-color-key-focus : black;
282
298
--spectrum-button-text-color-disabled : rgba (0 , 0 , 0 , 0.55 );
283
- --spectrum-button-background-color-hover : rgba (0 , 0 , 0 , 0.25 );
284
- --spectrum-button-background-color-down : rgba (0 , 0 , 0 , 0.4 );
285
- --spectrum-button-background-color-key-focus : rgba (0 , 0 , 0 , 0.25 );
299
+ --spectrum-button-background-color-hover : rgba (0 , 0 , 0 , 0.1 );
300
+ --spectrum-button-background-color-down : rgba (0 , 0 , 0 , 0.15 );
301
+ --spectrum-button-background-color-key-focus : rgba (0 , 0 , 0 , 0.1 );
286
302
}
287
303
}
288
304
}
@@ -593,9 +609,9 @@ governing permissions and limitations under the License.
593
609
.spectrum-ActionButton--staticWhite {
594
610
mix-blend-mode : screen;
595
611
--spectrum-actionbutton-static-background-color : var (--spectrum-actionbutton-static-white-background-color );
596
- --spectrum-actionbutton-static-background-color-hover : rgba (255 , 255 , 255 , 0.25 );
597
- --spectrum-actionbutton-static-background-color-focus : rgba (255 , 255 , 255 , 0.25 );
598
- --spectrum-actionbutton-static-background-color-active : rgba (255 , 255 , 255 , 0.4 );
612
+ --spectrum-actionbutton-static-background-color-hover : rgba (255 , 255 , 255 , 0.1 );
613
+ --spectrum-actionbutton-static-background-color-focus : rgba (255 , 255 , 255 , 0.1 );
614
+ --spectrum-actionbutton-static-background-color-active : rgba (255 , 255 , 255 , 0.15 );
599
615
--spectrum-actionbutton-static-background-color-disabled : var (--spectrum-actionbutton-static-white-background-color-disabled );
600
616
--spectrum-actionbutton-static-background-color-selected : rgba (255 , 255 , 255 , 0.9 );
601
617
--spectrum-actionbutton-static-background-color-selected-hover : white;
@@ -622,9 +638,9 @@ governing permissions and limitations under the License.
622
638
.spectrum-ActionButton--staticBlack {
623
639
mix-blend-mode : multiply;
624
640
--spectrum-actionbutton-static-background-color : var (--spectrum-actionbutton-static-black-background-color );
625
- --spectrum-actionbutton-static-background-color-hover : rgba (0 , 0 , 0 , 0.25 );
626
- --spectrum-actionbutton-static-background-color-focus : rgba (0 , 0 , 0 , 0.25 );
627
- --spectrum-actionbutton-static-background-color-active : rgba (0 , 0 , 0 , 0.4 );
641
+ --spectrum-actionbutton-static-background-color-hover : rgba (0 , 0 , 0 , 0.1 );
642
+ --spectrum-actionbutton-static-background-color-focus : rgba (0 , 0 , 0 , 0.1 );
643
+ --spectrum-actionbutton-static-background-color-active : rgba (0 , 0 , 0 , 0.15 );
628
644
--spectrum-actionbutton-static-background-color-selected : rgba (0 , 0 , 0 , 0.9 );
629
645
--spectrum-actionbutton-static-background-color-disabled : var (--spectrum-actionbutton-static-black-background-color-disabled );
630
646
--spectrum-actionbutton-static-background-color-selected-hover : black;
0 commit comments