Add depend: highcarts. Pages: power, analytical motherboard, memory, fans, event logs, Fix styles, add global components.

1 files changed, 22 insertions, 18 deletions

diff --git a/src/components/SubHeader/SubHeader.vue b/src/components/SubHeader/SubHeader.vue
index dd99f0d3..4ab6b094 100644
--- a/src/components/SubHeader/SubHeader.vue
+++ b/src/components/SubHeader/SubHeader.vue
@@ -6,9 +6,18 @@
         <b-navbar-nav>
           <b-nav-item
             to="/"
-            exact
             data-test-id="appHeader-container-health"
             class="subheader-button"
+            :class="{
+              'active-route-top': ![
+                'profile-settings',
+                'information-and-faq',
+                'support',
+                'console-settings',
+                'console',
+                'security-and-access',
+              ].includes($route.path.split('/')[1]),
+            }"
           >
             {{ $t('subHeader.serverInfo') }}
           </b-nav-item>
@@ -18,9 +27,10 @@
             data-test-id="appHeader-container-health"
             class="subheader-button"
             :class="{
-              'active-route-top': ''.includes(
-                $route.path.split('/console-settings')[1]
-              ),
+              'active-route-top':
+                ''.includes($route.path.split('/console-settings')[1]) ||
+                ''.includes($route.path.split('/console/serial-over-lan')[1]) ||
+                ''.includes($route.path.split('/console/kvm')[1]),
             }"
           >
             {{ $t('subHeader.console') }}
@@ -101,12 +111,6 @@ export default {
     margin-left: 10px;
   }
 
-  .active-route-top {
-    background-color: $white;
-    color: #1a3e5b !important;
-    border-radius: 4px;
-  }
-
   .navbar-text,
   .nav-link,
   .btn-link {
@@ -150,9 +154,6 @@ export default {
   .navbar-nav {
     align-items: baseline;
     padding-left: 24px;
-    .nav-link {
-      color: white;
-    }
     .nav-tags {
       @include media-breakpoint-down(xs) {
         @include sr-only;
@@ -164,11 +165,14 @@ export default {
       }
     }
   }
+}
+#sub-header .nav-item.active-route-top > a {
+  background-color: $white;
+  color: #1a3e5b;
+  border-radius: 4px;
+}
 
-  .router-link-active {
-    color: #1a3e5b !important;
-    background-color: white;
-    padding: 0.68rem 1rem !important;
-  }
+.navbar-dark .navbar-nav .nav-link {
+  color: rgba(255, 255, 255, 1);
 }
 </style>