Merge pull request #2126 from sg00dwin/vertical-nav-tab-focus

Merged by openshift-bot

Author: OpenShift Bot

app/styles/_vertical-nav.less

@@ -31,21 +31,22 @@
     }
     &.active > a,
     &:focus > a,
-    &:hover > a {
+    &:hover > a,
+    > a:focus,
+    > a:hover {
       background-color: @nav-pf-vertical-active-bg-color;
+      color: @nav-pf-vertical-active-color;
       font-weight: 300;
-    }
-    &.active > a {
+      &:after,
       .fa,
       .pficon {
-        color: @nav-pf-vertical-active-icon-color !important;
+        color: @nav-pf-vertical-active-color;
       }
     }
-    &:focus > a,
-    &:hover > a {
+    &.active > a {
       .fa,
       .pficon {
-        color: @nav-pf-vertical-active-color;
+        color: @nav-pf-vertical-active-icon-color !important;
       }
     }
     > a {
@@ -76,6 +77,10 @@
         padding: 8px 0;
       }
     }
+    // make right arrow size consistent with project-bar arrows
+    &.secondary-nav-item-pf > a:after {
+      font-size: 14px;
+    }
   }
   &.collapsed {
     .list-group-item.secondary-nav-item-pf:hover,
@@ -95,15 +100,6 @@
     box-shadow: 2px 0 3px rgba(3,3,3,.15);
     left: 0;
   }
-  .list-group-item.secondary-nav-item-pf {
-    &:hover > a:after {
-      color: @nav-pf-vertical-active-color;
-    }
-    // right arrow alignment
-    > a:after {
-      font-size: 14px;
-    }
-  }
   .nav-pf-secondary-nav {
     background: @nav-pf-vertical-active-bg-color;
     border-left: 0;
@@ -126,9 +122,11 @@
       }
       > a {
         background: transparent;
+        &:focus,
         &:hover {
-          text-decoration: none;
           background: @nav-pf-vertical-secondary-hover-color;
+          color: @nav-pf-vertical-secondary-active-color;
+          text-decoration: none;
         }
       }
     }