Merge branch '4.2' into main

ibexa · Oct 28, 2022 · 193378a · 193378a
2 parents cbfb81e + 5a2150c
commit 193378a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/bundle/Resources/public/scss/ui/modules/common/_simple.dropdown.scss b/src/bundle/Resources/public/scss/ui/modules/common/_simple.dropdown.scss
@@ -1,18 +1,24 @@
 .c-simple-dropdown {
     position: relative;
     min-width: calculateRem(120px);
+    height: calculateRem(32px);
+    border: calculateRem(1px) solid transparent;
+    border-radius: $ibexa-border-radius;
+    display: flex;
+    align-items: center;
 
     &__selected {
         font-size: $ibexa-text-font-size-medium;
-        padding: calculateRem(2px) calculateRem(30px) calculateRem(2px) 0;
+        padding: calculateRem(2px) calculateRem(30px) calculateRem(2px) calculateRem(8px);
         min-height: calculateRem(21px);
         cursor: pointer;
         position: relative;
+        width: 100%;
     }
 
     &__expand-icon {
         position: absolute;
-        top: calculateRem(9px);
+        top: calculateRem(7px);
         right: calculateRem(8px);
     }
 
@@ -77,6 +83,7 @@
     &__list-item-type-icon,
     &__selected-item-type-icon {
         margin-right: calculateRem(8px);
+        margin-top: calculateRem(-2px);
     }
 
     &__option-label {
@@ -113,4 +120,12 @@
             }
         }
     }
+
+    &:hover {
+        border-color: $ibexa-color-primary;
+
+        .c-simple-dropdown__expand-icon {
+            fill: $ibexa-color-primary;
+        }
+    }
 }
diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_tab.selector.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_tab.selector.scss
@@ -33,5 +33,11 @@
                 background-color: $ibexa-color-dark-200;
             }
         }
+
+        &:hover {
+            .ibexa-icon {
+                fill: $ibexa-color-primary;
+            }
+        }
     }
 }
diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_top.menu.search.input.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_top.menu.search.input.scss
@@ -1,4 +1,6 @@
 .c-top-menu-search-input {
+    margin-left: calculateRem(8px);
+
     &--search-opened {
         .c-top-menu-search-input {
             &__search-input {

diff --git a/src/bundle/ui-dev/src/modules/common/simple-dropdown/simple.dropdown.js b/src/bundle/ui-dev/src/modules/common/simple-dropdown/simple.dropdown.js
@@ -47,7 +47,7 @@ const SimpleDropdown = ({ options, selectedOption, extraClasses, onOptionClick,
     const renderCaretIcon = () => {
         const iconName = isExpanded ? 'caret-up' : 'caret-down';
 
-        return <Icon name={iconName} extraClasses="ibexa-icon--tiny c-simple-dropdown__expand-icon" />;
+        return <Icon name={iconName} extraClasses="ibexa-icon--tiny-small c-simple-dropdown__expand-icon" />;
     };
     const renderSelectedLabel = () => {
         if (!selectedOption && !!selectedItemLabel) {