EPMRPP-90219 || wrong color of organisation name when hovering (#3788)

reportportal · Apr 2, 2024 · 0492e59 · 0492e59
1 parent f2b090a
commit 0492e59
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 36 deletions.
diff --git a/app/src/componentLibrary/sidebar/navbar/navbar.jsx b/app/src/componentLibrary/sidebar/navbar/navbar.jsx
@@ -45,40 +45,44 @@ export const Navbar = ({
     <div className={cx('main-block')}>
       {createMainControlBlock(onCloseNavbar, setIsOpenPopover)}
     </div>
-    <div className={cx('top-block')}>
-      {topSidebarControlItems.map(({ sidebarBlockItem, key, onClick }) => (
-        <SidebarButton
-          key={key}
-          className={cx('navbar-btn', getClassName(key))}
-          onClick={() => {
-            onClick();
-            onCloseNavbar();
-          }}
-          onMouseEnter={() => setHoverType(key)}
-          onMouseLeave={clearActionButton}
-          onMouseDown={() => setActiveType(key)}
-        >
-          {sidebarBlockItem}
-        </SidebarButton>
-      ))}
-    </div>
-    <div className={cx('bottom-block')}>
-      {bottomSidebarControlItems.map(({ bottomSidebarItem, key, onClick }) => (
-        <SidebarButton
-          key={key}
-          className={cx('navbar-btn', getClassName(key))}
-          onClick={() => {
-            onClick();
-            onCloseNavbar();
-          }}
-          onMouseEnter={() => setHoverType(key)}
-          onMouseLeave={clearActionButton}
-          onMouseDown={() => setActiveType(key)}
-        >
-          {bottomSidebarItem}
-        </SidebarButton>
-      ))}
-    </div>
+    {topSidebarControlItems.length > 0 && (
+      <div className={cx('top-block')}>
+        {topSidebarControlItems.map(({ sidebarBlockItem, key, onClick }) => (
+          <SidebarButton
+            key={key}
+            className={cx('navbar-btn', getClassName(key))}
+            onClick={() => {
+              onClick();
+              onCloseNavbar();
+            }}
+            onMouseEnter={() => setHoverType(key)}
+            onMouseLeave={clearActionButton}
+            onMouseDown={() => setActiveType(key)}
+          >
+            {sidebarBlockItem}
+          </SidebarButton>
+        ))}
+      </div>
+    )}
+    {bottomSidebarControlItems.length > 0 && (
+      <div className={cx('bottom-block')}>
+        {bottomSidebarControlItems.map(({ bottomSidebarItem, key, onClick }) => (
+          <SidebarButton
+            key={key}
+            className={cx('navbar-btn', getClassName(key))}
+            onClick={() => {
+              onClick();
+              onCloseNavbar();
+            }}
+            onMouseEnter={() => setHoverType(key)}
+            onMouseLeave={clearActionButton}
+            onMouseDown={() => setActiveType(key)}
+          >
+            {bottomSidebarItem}
+          </SidebarButton>
+        ))}
+      </div>
+    )}
     <div className={cx('bottom-block')}>
       {createFooterControlBlock(onCloseNavbar, setIsOpenPopover)}
     </div>

diff --git a/app/src/componentLibrary/sidebar/navbar/navbar.scss b/app/src/componentLibrary/sidebar/navbar/navbar.scss
@@ -37,6 +37,7 @@
 
 .logo-wrapper {
   height: 48px;
+  min-height: 48px;
   display: flex;
   align-items: center;
   padding-left: 16px;

diff --git a/...idebar/organizationsControl/organizationsPopover/organizationsItem/organizationsItem.scss b/...idebar/organizationsControl/organizationsPopover/organizationsItem/organizationsItem.scss
@@ -80,11 +80,11 @@
   width: 0;
 
   &:focus-visible {
-    color: $COLOR--darkmode-gray-100;
+    color: $COLOR--white-two;
   }
 
   &:hover {
-    color: $COLOR--darkmode-topaz-text;
+    color: $COLOR--white-two;
     background-color: $COLOR--darkmode-gray-500;
   }
 }