Merge branch 'alpha-4.53.0' into patch-9

homebridge · Nov 20, 2023 · 4bc9729 · 4bc9729
2 parents eb167f6 + cf70b42
commit 4bc9729
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 23 deletions.
diff --git a/ui/src/app/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html
@@ -15,16 +15,13 @@
       <ul class="navbar-nav mr-auto">
         <li class="nav-item waves-effect waves-light" routerLinkActive="active"
           [routerLinkActiveOptions]="{exact: true}">
-          <a class="nav-link" routerLink="/" [translate]="'menu.label_status'"
-            data-toggle="collapse" data-target=".navbar-toggler">Status</a>
+          <a class="nav-link" routerLink="/" [translate]="'menu.label_status'">Status</a>
         </li>
         <li class="nav-item waves-effect waves-light" routerLinkActive="active" *ngIf="$auth.user.admin">
-          <a class="nav-link" routerLink="/plugins" [translate]="'menu.label_plugins'"
-            data-toggle="collapse" data-target=".navbar-toggler">Plugins</a>
+          <a class="nav-link" routerLink="/plugins" [translate]="'menu.label_plugins'">Plugins</a>
         </li>
         <li class="nav-item waves-effect waves-light" routerLinkActive="active" *ngIf="$auth.user.admin">
-          <a class="nav-link" routerLink="/config" [translate]="'menu.label_config'"
-            data-toggle="collapse" data-target=".navbar-toggler">Config</a>
+          <a class="nav-link" routerLink="/config" [translate]="'menu.label_config'">Config</a>
         </li>
         <li class="nav-item waves-effect waves-light" routerLinkActive="active" *ngIf="$settings.env.enableAccessories">
           <a class="nav-link" routerLink="/accessories" [translate]="'menu.label_accessories'">Accessories</a>

diff --git a/ui/src/app/shared/layout/layout.component.scss b/ui/src/app/shared/layout/layout.component.scss
@@ -1,8 +1,3 @@
-@media (min-width: 992px) {
-  .body-top-padding {
-    padding-top: 0px !important;
-  }
-}
 
 /* MOBILE NAVBAR */
 
@@ -92,10 +87,8 @@
   left: 0;
   height: 100%;
   width: 260px;
-  background: #0f0f0f;
   z-index: 100;
   transition: all 0.5s ease;
-  overflow: hidden;
 }
 .sidebar.show{
   width: 78px;
@@ -112,23 +105,23 @@
 }
 .sidebar .logo-details i, .sidebar .logo-details img {
   font-size: 30px;
-  color: #fff;
   height: 50px;
   min-width: 78px;
   text-align: center;
   line-height: 50px;
 }
 .sidebar .logo-details .logo_name{
   font-size: 22px;
-  color: #fff;
   font-weight: 600;
   transition: 0.3s ease;
   transition-delay: 0.1s;
+  display: inline-block;
 }
 .sidebar.show .logo-details .logo_name{
   transition-delay: 0s;
   opacity: 0;
   pointer-events: none;
+  display: none;
 }
 .sidebar .nav-links{
   height: 100%;
@@ -146,9 +139,7 @@
   list-style: none;
   transition: all 0.4s ease;
 }
-.sidebar .nav-links li:hover{
-  background: #333333;
-}
+
 .sidebar .nav-links li .iocn-link{
   display: flex;
   align-items: center;
@@ -162,7 +153,6 @@
   min-width: 78px;
   text-align: center;
   line-height: 50px;
-  color: #fff;
   font-size: 20px;
   cursor: pointer;
   transition: all 0.3s ease;
@@ -181,7 +171,6 @@
 .sidebar .nav-links li a .link_name{
   font-size: 18px;
   font-weight: 400;
-  color: #fff;
   transition: all 0.4s ease;
 }
 .sidebar.show .nav-links li a .link_name{
@@ -191,15 +180,13 @@
 .sidebar .nav-links li .sub-menu{
   padding: 6px 6px 14px 80px;
   margin-top: -10px;
-  background: #333333;
   display: none;
   transition: all 0.3s ease;
 }
 .sidebar .nav-links li.show .sub-menu{
   display: block;
 }
 .sidebar .nav-links li .sub-menu a{
-  color: #fff;
   font-size: 15px;
   padding: 5px 0;
   white-space: nowrap;
@@ -255,7 +242,6 @@
 }
 
 .li-link1.show, .li-link2.show {
-  background: #333333;
   transition: 0s;
 }
 

diff --git a/ui/src/scss/themes/themes-dark.scss b/ui/src/scss/themes/themes-dark.scss
@@ -19,6 +19,24 @@
       border-bottom-width: 1px;
     }
 
+    .sidebar {
+      background-color: #0f0f0f;
+    }
+
+    .sidebar .nav-links li:hover,
+    .sidebar .nav-links li .sub-menu,
+    .li-link1.show, .li-link2.show {
+      background: #2b2b2b;
+    }
+
+    .sidebar .logo-details i, .sidebar .logo-details img,
+    .sidebar .logo-details .logo_name,
+    .sidebar .nav-links li i,
+    .sidebar .nav-links li a .link_name,
+    .sidebar .nav-links li .sub-menu a {
+      color: #ffffff;
+    }
+
     .dropdown-menu {
       background-color: #222222;
     }

diff --git a/ui/src/scss/themes/themes-light.scss b/ui/src/scss/themes/themes-light.scss
@@ -6,6 +6,24 @@
       background-color: $primary-dark !important;
     }
 
+    .sidebar {
+      background-color: #ffffff;
+    }
+
+    .sidebar .nav-links li:hover,
+    .sidebar .nav-links li .sub-menu,
+    .li-link1.show, .li-link2.show {
+      background: #cccccc;
+    }
+
+    .sidebar .logo-details i, .sidebar .logo-details img,
+    .sidebar .logo-details .logo_name,
+    .sidebar .nav-links li i,
+    .sidebar .nav-links li a .link_name,
+    .sidebar .nav-links li .sub-menu a {
+      color: #333333;
+    }
+
     .primary-text {
       color: $primary;
     }