Skip to content

Commit 2587ced

Browse files
authored
fix(dropdown, form): unify focus, hover borders and icons
Unify border and icon visuals between input and dropdown fix search selection dropdowns not activating focus border when tabbed add hover border to inputs just as dropdown has same icon opacity logic
1 parent 08397dc commit 2587ced

File tree

6 files changed

+37
-2
lines changed

6 files changed

+37
-2
lines changed

src/definitions/collections/form.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,11 @@
640640
box-shadow: @formStates[@@state][inputFocusBoxShadow];
641641
}
642642

643+
.ui.form .field.@{state} > textarea:hover:not(:focus),
644+
.ui.form .field.@{state} > input:hover:not(:focus) {
645+
border-color: @formStates[@@state][inputHoverBorderColor];
646+
}
647+
643648
/* Preserve Native Select Stylings */
644649
.ui.form .field.@{state} select {
645650
-webkit-appearance: menulist-button;

src/definitions/elements/input.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,13 @@
113113
box-shadow: @downBoxShadow;
114114
}
115115

116+
.ui.form .field > textarea:hover:not(:focus),
117+
.ui.input > textarea:hover:not(:focus),
118+
.ui.form .field > input:hover:not(:focus),
119+
.ui.input > input:hover:not(:focus) {
120+
border-color: @selectedBorderColor;
121+
}
122+
116123
& when (@variationInputLoading) {
117124
/* --------------------
118125
Loading

src/definitions/modules/dropdown.less

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
@notButton: if(@variationDropdownButton, e(":not(.button)"));
2828
@notSimple: if(@variationDropdownSimple, e(":not(.simple)"));
2929
@notUpward: if(@variationDropdownUpward, e(":not(.upward)"));
30+
@notInverted: if(@variationDropdownInverted, e(":not(.inverted)"));
3031

3132
@notTransparent: if(@variationInputTransparent, e(":not(.transparent)"));
3233
@notVertical: if(@variationMenuVertical, e(":not(.vertical)"));
@@ -623,6 +624,18 @@ select.ui.dropdown {
623624
border-color: @selectionFocusBorderColor;
624625
box-shadow: @selectionFocusMenuBoxShadow;
625626
}
627+
@supports selector(:has(.f)) {
628+
.ui.ui.selection.dropdown@{notInverted}:has(> input:focus) {
629+
border-color: @selectionFocusBorderColor;
630+
box-shadow: none;
631+
& > i.icon {
632+
opacity: @selectionIconFocusOpacity;
633+
}
634+
}
635+
}
636+
.ui.ui.selection.dropdown:focus > i.icon {
637+
opacity: @selectionIconFocusOpacity;
638+
}
626639

627640
/* Visible */
628641
.ui.selection.visible.dropdown > .text:not(.default) {

src/themes/default/globals/colors.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@
510510
inputFocusBackground: @inputErrorFocusBackground;
511511
inputFocusColor: @inputErrorFocusColor;
512512
inputFocusBorderColor: @inputErrorFocusBorder;
513+
inputHoverBorderColor: @inputErrorHoverBorder;
513514
inputFocusBoxShadow: @inputErrorFocusBoxShadow;
514515
inputPlaceholderColor: @inputErrorPlaceholderColor;
515516
inputPlaceholderFocusColor: @inputErrorPlaceholderFocusColor;
@@ -538,6 +539,7 @@
538539
inputFocusBackground: @inputInfoFocusBackground;
539540
inputFocusColor: @inputInfoFocusColor;
540541
inputFocusBorderColor: @inputInfoFocusBorder;
542+
inputHoverBorderColor: @inputInfoHoverBorder;
541543
inputFocusBoxShadow: @inputInfoFocusBoxShadow;
542544
inputPlaceholderColor: @inputInfoPlaceholderColor;
543545
inputPlaceholderFocusColor: @inputInfoPlaceholderFocusColor;
@@ -566,6 +568,7 @@
566568
inputFocusBackground: @inputSuccessFocusBackground;
567569
inputFocusColor: @inputSuccessFocusColor;
568570
inputFocusBorderColor: @inputSuccessFocusBorder;
571+
inputHoverBorderColor: @inputSuccessHoverBorder;
569572
inputFocusBoxShadow: @inputSuccessFocusBoxShadow;
570573
inputPlaceholderColor: @inputSuccessPlaceholderColor;
571574
inputPlaceholderFocusColor: @inputSuccessPlaceholderFocusColor;
@@ -594,6 +597,7 @@
594597
inputFocusBackground: @inputWarningFocusBackground;
595598
inputFocusColor: @inputWarningFocusColor;
596599
inputFocusBorderColor: @inputWarningFocusBorder;
600+
inputHoverBorderColor: @inputWarningHoverBorder;
597601
inputFocusBoxShadow: @inputWarningFocusBoxShadow;
598602
inputPlaceholderColor: @inputWarningPlaceholderColor;
599603
inputPlaceholderFocusColor: @inputWarningPlaceholderFocusColor;

src/themes/default/globals/site.variables

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,21 +1510,25 @@
15101510
@inputErrorFocusColor: @negativeTextColor;
15111511
@inputErrorFocusBorder: @negativeBorderColor;
15121512
@inputErrorFocusBoxShadow: none;
1513+
@inputErrorHoverBorder: @negativeBorderColor;
15131514

15141515
@inputInfoFocusBackground: @infoBackgroundColor;
15151516
@inputInfoFocusColor: @infoTextColor;
15161517
@inputInfoFocusBorder: @infoBorderColor;
15171518
@inputInfoFocusBoxShadow: none;
1519+
@inputInfoHoverBorder: @infoBorderColor;
15181520

15191521
@inputSuccessFocusBackground: @positiveBackgroundColor;
15201522
@inputSuccessFocusColor: @positiveTextColor;
15211523
@inputSuccessFocusBorder: @positiveBorderColor;
15221524
@inputSuccessFocusBoxShadow: none;
1525+
@inputSuccessHoverBorder: @positiveBorderColor;
15231526

15241527
@inputWarningFocusBackground: @warningBackgroundColor;
15251528
@inputWarningFocusColor: @warningTextColor;
15261529
@inputWarningFocusBorder: @warningBorderColor;
15271530
@inputWarningFocusBoxShadow: none;
1531+
@inputWarningHoverBorder: @warningBorderColor;
15281532

15291533
/* Placeholder state */
15301534
@inputErrorPlaceholderColor: if(iscolor(@formErrorColor), lighten(@formErrorColor, 40), @formErrorColor);

src/themes/default/modules/dropdown.variables

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
@selectionBorder: 1px solid @selectionBorderColor;
163163
@selectionBorderRadius: @borderRadius;
164164

165-
@selectionIconOpacity: 0.8;
165+
@selectionIconOpacity: 0.5;
166166
@selectionIconZIndex: 3;
167167
@selectionIconHitbox: @selectionVerticalPadding;
168168
@selectionIconMargin: -@selectionIconHitbox;
@@ -219,6 +219,8 @@
219219
@selectionVisibleConnectingBorder: 0;
220220
@selectionVisibleIconOpacity: "";
221221

222+
@selectionIconFocusOpacity: 1;
223+
222224
/* --------------
223225
Search
224226
-------------- */
@@ -315,7 +317,7 @@
315317
@selectedColor: @selectedTextColor;
316318

317319
/* Clearable */
318-
@clearableIconOpacity: 0.6;
320+
@clearableIconOpacity: 0.5;
319321
@clearableIconActiveOpacity: 1;
320322
@clearableTextMargin: 1.5em;
321323
@clearableIconMargin: 1.5em;

0 commit comments

Comments
 (0)