@@ -16,7 +16,7 @@ governing permissions and limitations under the License.
16
16
--spectrum-menu-item-icon-width : var (--spectrum-workflow-icon-size-100 );
17
17
--spectrum-menu-item-label-font-size : var (--spectrum-font-size-100 );
18
18
--spectrum-menu-item-label-text-to-visual : var (--spectrum-text-to-visual-100 );
19
-
19
+
20
20
--spectrum-menu-item-label-inline-edge-to-content : var (--spectrum-component-edge-to-text-100 );
21
21
--spectrum-menu-item-top-edge-to-text : var (--spectrum-component-top-to-text-100 );
22
22
--spectrum-menu-item-bottom-edge-to-text : var (--spectrum-component-bottom-to-text-100 );
@@ -71,7 +71,7 @@ governing permissions and limitations under the License.
71
71
--spectrum-menu-section-header-font-weight : var (--spectrum-bold-font-weight );
72
72
--spectrum-menu-section-header-color : var (--spectrum-gray-900 );
73
73
--spectrum-menu-collapsible-icon-color : var (--spectrum-gray-900 );
74
-
74
+
75
75
--spectrum-menu-checkmark-icon-color-default : var (--spectrum-accent-color-900 );
76
76
--spectrum-menu-checkmark-icon-color-hover : var (--spectrum-accent-color-1000 );
77
77
--spectrum-menu-checkmark-icon-color-down : var (--spectrum-accent-color-1100 );
@@ -120,7 +120,7 @@ governing permissions and limitations under the License.
120
120
--spectrum-menu-item-icon-width : var (--spectrum-workflow-icon-size-75 );
121
121
--spectrum-menu-item-label-font-size : var (--spectrum-font-size-75 );
122
122
--spectrum-menu-item-label-text-to-visual : var (--spectrum-text-to-visual-75 );
123
-
123
+
124
124
--spectrum-menu-item-label-inline-edge-to-content : var (--spectrum-component-edge-to-text-75 );
125
125
--spectrum-menu-item-top-edge-to-text : var (--spectrum-component-top-to-text-75 );
126
126
--spectrum-menu-item-bottom-edge-to-text : var (--spectrum-component-bottom-to-text-75 );
@@ -147,7 +147,7 @@ governing permissions and limitations under the License.
147
147
--spectrum-menu-item-icon-width : var (--spectrum-workflow-icon-size-200 );
148
148
--spectrum-menu-item-label-font-size : var (--spectrum-font-size-200 );
149
149
--spectrum-menu-item-label-text-to-visual : var (--spectrum-text-to-visual-200 );
150
-
150
+
151
151
--spectrum-menu-item-label-inline-edge-to-content : var (--spectrum-component-edge-to-text-200 );
152
152
--spectrum-menu-item-top-edge-to-text : var (--spectrum-component-top-to-text-200 );
153
153
--spectrum-menu-item-bottom-edge-to-text : var (--spectrum-component-bottom-to-text-200 );
@@ -174,7 +174,7 @@ governing permissions and limitations under the License.
174
174
--spectrum-menu-item-icon-width : var (--spectrum-workflow-icon-size-300 );
175
175
--spectrum-menu-item-label-font-size : var (--spectrum-font-size-300 );
176
176
--spectrum-menu-item-label-text-to-visual : var (--spectrum-text-to-visual-300 );
177
-
177
+
178
178
--spectrum-menu-item-label-inline-edge-to-content : var (--spectrum-component-edge-to-text-300 );
179
179
--spectrum-menu-item-top-edge-to-text : var (--spectrum-component-top-to-text-300 );
180
180
--spectrum-menu-item-bottom-edge-to-text : var (--spectrum-component-bottom-to-text-300 );
@@ -227,7 +227,7 @@ governing permissions and limitations under the License.
227
227
--highcontrast-checkbox-highlight-color-hover : ButtonText;
228
228
--highcontrast-checkbox-highlight-color-default : ButtonText;
229
229
}
230
-
230
+
231
231
.spectrum-Menu-itemSwitch {
232
232
--highcontrast-switch-handle-border-color-hover : ButtonText;
233
233
--highcontrast-switch-handle-border-color-selected-default : ButtonText;
@@ -281,7 +281,7 @@ governing permissions and limitations under the License.
281
281
.spectrum-Menu-divider {
282
282
--spectrum-menu-divider-thickness : var (--spectrum-divider-thickness-medium );
283
283
& .spectrum-Divider--sizeS {
284
- --spectrum-menu-divider-thickness : var (--spectrum-divider-thickness-small );
284
+ --spectrum-menu-divider-thickness : var (--spectrum-divider-thickness-small );
285
285
}
286
286
287
287
overflow : visible;
@@ -339,14 +339,14 @@ governing permissions and limitations under the License.
339
339
box-sizing : border-box;
340
340
341
341
background-color : var (--highcontrast-menu-item-background-color-default , var (--mod-menu-item-background-color-default , var (--spectrum-menu-item-background-color-default )));
342
-
342
+
343
343
line-height : var (--mod-menu-item-label-line-height , var (--spectrum-menu-item-label-line-height ));
344
344
345
345
min-block-size : var (--mod-menu-item-min-height , var (--spectrum-menu-item-min-height ));
346
346
padding-block-start : var (--mod-menu-item-top-edge-to-text , var (--spectrum-menu-item-top-edge-to-text ));
347
347
padding-block-end : var (--mod-menu-item-bottom-edge-to-text , var (--spectrum-menu-item-bottom-edge-to-text ));
348
348
padding-inline : var (--mod-menu-item-label-inline-edge-to-content , var (--spectrum-menu-item-label-inline-edge-to-content ));
349
-
349
+
350
350
margin : 0 ;
351
351
text-decoration : none;
352
352
@@ -365,7 +365,7 @@ governing permissions and limitations under the License.
365
365
366
366
.spectrum-Menu-itemSwitch {
367
367
min-block-size : 0 ;
368
-
368
+
369
369
.spectrum-Switch-switch {
370
370
margin-block-start : var (--mod-menu-item-top-to-action , var (--spectrum-menu-item-top-to-action ));;
371
371
margin- block- end: 0;
@@ -377,11 +377,11 @@ governing permissions and limitations under the License.
377
377
display : grid;
378
378
/* stylelint-disable declaration-block-no-redundant-longhand-properties */
379
379
grid-template-areas :
380
- ". chevronAreaCollapsible . iconArea sectionHeadingArea . . . "
380
+ ". chevronAreaCollapsible . headingIconArea sectionHeadingArea . . . "
381
381
"selectedArea chevronAreaCollapsible checkmarkArea iconArea labelArea valueArea actionsArea chevronAreaDrillIn"
382
382
". . . . descriptionArea . . . "
383
383
". . . . submenuArea . . . " ;
384
-
384
+
385
385
grid-template-columns : auto auto auto auto 1fr auto auto auto;
386
386
grid-template-rows : 1fr auto;
387
387
}
@@ -422,7 +422,7 @@ governing permissions and limitations under the License.
422
422
> .spectrum-Menu-itemValue {
423
423
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-value-color-focus , var (--spectrum-menu-item-value-color-focus )));
424
424
}
425
-
425
+
426
426
> .spectrum-Menu-itemIcon : not (.spectrum-Menu-chevron , .spectrum-Menu-checkmark ) {
427
427
fill : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-label-icon-color-focus , var (--spectrum-menu-item-label-icon-color-focus )));
428
428
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-label-icon-color-focus , var (--spectrum-menu-item-label-icon-color-focus )));
@@ -469,7 +469,7 @@ governing permissions and limitations under the License.
469
469
> .spectrum-Menu-itemValue {
470
470
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-value-color-hover , var (--spectrum-menu-item-value-color-hover )));
471
471
}
472
-
472
+
473
473
> .spectrum-Menu-itemIcon : not (.spectrum-Menu-chevron , .spectrum-Menu-checkmark ) {
474
474
fill : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-label-icon-color-hover , var (--spectrum-menu-item-label-icon-color-hover )));
475
475
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-label-icon-color-hover , var (--spectrum-menu-item-label-icon-color-hover )));
@@ -492,7 +492,7 @@ governing permissions and limitations under the License.
492
492
> .spectrum-Menu-itemLabel {
493
493
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-label-content-color-down , var (--spectrum-menu-item-label-content-color-down )));
494
494
}
495
-
495
+
496
496
> .spectrum-Menu-sectionHeading {
497
497
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-section-header-color , var (--spectrum-menu-section-header-color )));
498
498
}
@@ -504,7 +504,7 @@ governing permissions and limitations under the License.
504
504
> .spectrum-Menu-itemValue {
505
505
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-value-color-down , var (--spectrum-menu-item-value-color-down )));
506
506
}
507
-
507
+
508
508
> .spectrum-Menu-itemIcon : not (.spectrum-Menu-chevron , .spectrum-Menu-checkmark ) {
509
509
fill : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-label-icon-color-down , var (--spectrum-menu-item-label-icon-color-down )));
510
510
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-item-label-icon-color-down , var (--spectrum-menu-item-label-icon-color-down )));
@@ -526,6 +526,17 @@ governing permissions and limitations under the License.
526
526
align-self : start;
527
527
}
528
528
529
+ .spectrum-Menu-item--collapsible .spectrum-Menu-itemIcon {
530
+ grid-area : headingIconArea;
531
+ }
532
+
533
+ .is-selectableMultiple .spectrum-Menu-item {
534
+ align-items : start;
535
+ }
536
+ .is-selectableMultiple .spectrum-Menu-itemCheckbox {
537
+ grid-area : iconArea;
538
+ }
539
+
529
540
.spectrum-Menu-checkmark {
530
541
grid-area : checkmarkArea;
531
542
align-self : start;
@@ -537,8 +548,6 @@ governing permissions and limitations under the License.
537
548
538
549
.spectrum-Menu-itemLabel {
539
550
grid-area : labelArea;
540
- display : flex;
541
- align-items : flex-start;
542
551
font-size : var (--mod-menu-item-label-font-size , var (--spectrum-menu-item-label-font-size ));
543
552
color : var (--highcontrast-menu-item-color-default , var (--mod-menu-item-label-content-color-default , var (--spectrum-menu-item-label-content-color-default )));
544
553
}
@@ -640,7 +649,7 @@ governing permissions and limitations under the License.
640
649
margin-inline-start : var (--mod-menu-item-label-to-value-area-min-spacing , var (--spectrum-menu-item-label-to-value-area-min-spacing ));
641
650
}
642
651
643
- .spectrum-Menu-itemLabel--wrapping {
652
+ .spectrum-Menu-itemLabel--truncate {
644
653
text-overflow : ellipsis;
645
654
white-space : nowrap;
646
655
overflow : hidden;
@@ -694,11 +703,11 @@ governing permissions and limitations under the License.
694
703
}
695
704
696
705
[dir = "rtl" ] .spectrum-Menu-chevron {
697
- transform : rotate (-180deg );
706
+ transform : rotate (-180deg );
698
707
}
699
708
700
709
/*
701
- assume that if an item is collapsible, it will
710
+ assume that if an item is collapsible, it will
702
711
have a chevron and we need to adjust position of submenu items to account for that
703
712
*/
704
713
.spectrum-Menu-item--collapsible .spectrum-Menu {
@@ -745,22 +754,22 @@ governing permissions and limitations under the License.
745
754
.spectrum-Menu-chevron {
746
755
fill : var (--highcontrast-menu-item-color-focus , var (--mod-menu-drillin-icon-color-hover , var (--spectrum-menu-drillin-icon-color-hover )));
747
756
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-drillin-icon-color-hover , var (--spectrum-menu-drillin-icon-color-hover )));
748
- }
757
+ }
749
758
}
750
759
751
760
& : focus ,
752
761
& .is-focused {
753
762
.spectrum-Menu-chevron {
754
763
fill : var (--highcontrast-menu-item-color-focus , var (--mod-menu-drillin-icon-color-focus , var (--spectrum-menu-drillin-icon-color-focus )));
755
764
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-drillin-icon-color-focus , var (--spectrum-menu-drillin-icon-color-focus )));
756
- }
765
+ }
757
766
}
758
767
759
768
& : active {
760
769
.spectrum-Menu-chevron {
761
770
fill : var (--highcontrast-menu-item-color-focus , var (--mod-menu-drillin-icon-color-down , var (--spectrum-menu-drillin-icon-color-down )));
762
771
color : var (--highcontrast-menu-item-color-focus , var (--mod-menu-drillin-icon-color-down , var (--spectrum-menu-drillin-icon-color-down )));
763
- }
772
+ }
764
773
}
765
774
}
766
775
@@ -773,11 +782,11 @@ governing permissions and limitations under the License.
773
782
.spectrum-Menu-sectionHeading {
774
783
color : var (--highcontrast-menu-item-color-disabled , var (--mod-menu-item-label-content-color-disabled , var (--spectrum-menu-item-label-content-color-disabled )));
775
784
}
776
-
785
+
777
786
.spectrum-Menu-itemDescription {
778
787
color : var (--highcontrast-menu-item-color-disabled , var (--mod-menu-item-description-color-disabled , var (--spectrum-menu-item-description-color-disabled )));
779
788
}
780
-
789
+
781
790
.spectrum-Menu-itemIcon {
782
791
fill : var (--highcontrast-menu-item-color-disabled , var (--mod-menu-item-label-icon-color-disabled , var (--spectrum-menu-item-label-icon-color-disabled )));
783
792
color : var (--highcontrast-menu-item-color-disabled , var (--mod-menu-item-label-icon-color-disabled , var (--spectrum-menu-item-label-icon-color-disabled )));
0 commit comments