Skip to content

Commit b46a14e

Browse files
committed
fix(@clay/css): LPD-46380 Labels in dropdown-item are slightly misaligned
1 parent 6456669 commit b46a14e

File tree

3 files changed

+44
-12
lines changed

3 files changed

+44
-12
lines changed

packages/clay-css/src/scss/cadmin/variables/_dropdowns.scss

+15-6
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ $cadmin-dropdown-item-base: map-deep-merge(
163163
line-height: $cadmin-dropdown-font-size * $cadmin-line-height-base,
164164
),
165165
'&.autofit-row': (
166+
align-items: center,
166167
padding-left: calc(#{$cadmin-dropdown-item-padding-x} - 4px),
167168
padding-right: calc(#{$cadmin-dropdown-item-padding-x} - 4px),
168169
autofit-col: (
@@ -171,6 +172,7 @@ $cadmin-dropdown-item-base: map-deep-merge(
171172
),
172173
),
173174
autofit-row: (
175+
align-items: center,
174176
margin-left: -4px,
175177
margin-right: -4px,
176178
width: auto,
@@ -179,6 +181,17 @@ $cadmin-dropdown-item-base: map-deep-merge(
179181
padding-right: 4px,
180182
),
181183
),
184+
inline-item: (
185+
line-height: 1,
186+
lexicon-icon: (
187+
font-size: 16px,
188+
margin-top: 0,
189+
),
190+
),
191+
label: (
192+
margin-bottom: 0,
193+
margin-top: 5px,
194+
),
182195
),
183196
$cadmin-dropdown-item-base
184197
);
@@ -408,6 +421,7 @@ $cadmin-dropdown-item-indicator-start: map-deep-merge(
408421
),
409422
width: $cadmin-dropdown-item-indicator-size,
410423
lexicon-icon: (
424+
font-size: 16px,
411425
margin-top: 0,
412426
),
413427
),
@@ -455,6 +469,7 @@ $cadmin-dropdown-item-indicator-end: map-deep-merge(
455469
),
456470
width: $cadmin-dropdown-item-indicator-size,
457471
lexicon-icon: (
472+
font-size: 16px,
458473
margin-top: 0,
459474
),
460475
),
@@ -812,10 +827,6 @@ $cadmin-dropdown-menu-palette: map-deep-merge(
812827
padding-left: 28px,
813828
padding-right: 8px,
814829
padding-top: 5px,
815-
'&.autofit-row': (
816-
padding-left: 24px,
817-
padding-right: 8px,
818-
),
819830
),
820831
dropdown-item-scroll: (
821832
font-size: 16px,
@@ -872,13 +883,11 @@ $cadmin-dropdown-menu-palette: map-deep-merge(
872883
dropdown-menu-indicator-start: (
873884
dropdown-item-indicator-start: (
874885
left: 8px,
875-
top: 8px,
876886
),
877887
),
878888
dropdown-menu-indicator-end: (
879889
dropdown-item-indicator-end: (
880890
right: 8px,
881-
top: 8px,
882891
),
883892
),
884893
),

packages/clay-css/src/scss/mixins/_dropdown-menu.scss

+14
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,20 @@
850850
.custom-control-label {
851851
font-weight: map-get($map, font-weight);
852852
}
853+
854+
.inline-item {
855+
$_inline-item: setter(map-get($map, inline-item), ());
856+
857+
@include clay-css($_inline-item);
858+
859+
.lexicon-icon {
860+
@include clay-css(map-get($_inline-item, lexicon-icon));
861+
}
862+
}
863+
864+
.label {
865+
@include clay-label-variant(map-get($map, label));
866+
}
853867
}
854868
}
855869
}

packages/clay-css/src/scss/variables/_dropdowns.scss

+15-6
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ $dropdown-item-base: map-deep-merge(
217217
line-height: calc(#{$dropdown-font-size} * #{$line-height-base}),
218218
),
219219
'&.autofit-row': (
220+
align-items: center,
220221
padding-left: calc(#{$dropdown-item-padding-x} - 0.25rem),
221222
padding-right: calc(#{$dropdown-item-padding-x} - 0.25rem),
222223
autofit-col: (
@@ -225,6 +226,7 @@ $dropdown-item-base: map-deep-merge(
225226
),
226227
),
227228
autofit-row: (
229+
align-items: center,
228230
margin-left: -0.25rem,
229231
margin-right: -0.25rem,
230232
width: auto,
@@ -233,6 +235,17 @@ $dropdown-item-base: map-deep-merge(
233235
padding-right: 0.25rem,
234236
),
235237
),
238+
inline-item: (
239+
line-height: 1,
240+
lexicon-icon: (
241+
font-size: 1rem,
242+
margin-top: 0,
243+
),
244+
),
245+
label: (
246+
margin-bottom: 0,
247+
margin-top: 0.3125rem,
248+
),
236249
),
237250
$dropdown-item-base
238251
);
@@ -502,6 +515,7 @@ $dropdown-item-indicator-start: map-deep-merge(
502515
),
503516
width: $dropdown-item-indicator-size,
504517
lexicon-icon: (
518+
font-size: 1rem,
505519
margin-top: 0,
506520
),
507521
),
@@ -548,6 +562,7 @@ $dropdown-item-indicator-end: map-deep-merge(
548562
),
549563
width: $dropdown-item-indicator-size,
550564
lexicon-icon: (
565+
font-size: 16px,
551566
margin-top: 0,
552567
),
553568
),
@@ -963,10 +978,6 @@ $dropdown-menu-palette: map-deep-merge(
963978
padding-left: 1.75rem,
964979
padding-right: 0.5rem,
965980
padding-top: 0.3125rem,
966-
'&.autofit-row': (
967-
padding-left: 1.5rem,
968-
padding-right: 0.5rem,
969-
),
970981
),
971982
dropdown-item-scroll: (
972983
font-size: 1rem,
@@ -1023,13 +1034,11 @@ $dropdown-menu-palette: map-deep-merge(
10231034
dropdown-menu-indicator-start: (
10241035
dropdown-item-indicator-start: (
10251036
left: 0.5rem,
1026-
top: 0.5rem,
10271037
),
10281038
),
10291039
dropdown-menu-indicator-end: (
10301040
dropdown-item-indicator-end: (
10311041
right: 0.5rem,
1032-
top: 0.5rem,
10331042
),
10341043
),
10351044
),

0 commit comments

Comments
 (0)