Merge branch 'develop' into feature

netbox/project-static/styles/netbox.scss

@@ -358,7 +358,7 @@ nav.search {
   // Don't overtake dropdowns
   z-index: 999;
   justify-content: center;
-  background-color: var(--nbx-body-bg);
+  background-color: $navbar-light-color;
 
   .search-container {
     display: flex;
@@ -452,8 +452,8 @@ main.login-container {
 }
 
 .footer {
+  background-color: $tab-content-bg;
   padding: 0;
-
   .nav-link {
     padding: 0.5rem;
   }
@@ -517,6 +517,10 @@ h6.accordion-item-title {
   }
 }
 
+.navbar {
+  border-bottom: 1px solid $border-color;
+}
+
 .navbar-brand {
   padding-top: 0.75rem;
   padding-bottom: 0.75rem;
@@ -554,6 +558,7 @@ div.content-container {
   }
 
   div.content {
+    background-color: $tab-content-bg;
     flex: 1;
   }
 
@@ -592,6 +597,10 @@ span.color-label {
   box-shadow: $box-shadow-sm;
 }
 
+.badge a {
+  color: inherit;
+}
+
 .btn {
   white-space: nowrap;
 }
@@ -898,6 +907,7 @@ div.card-overlay {
 
 // Tabbed content
 .nav-tabs {
+  background-color: $body-bg;
   .nav-link {
     &:hover {
       // Don't show a bottom-border on a hovered nav link because it overlaps with the .nav-tab border.
@@ -919,14 +929,6 @@ div.card-overlay {
   display: flex;
   flex-direction: column;
   padding: $spacer;
-  background-color: $tab-content-bg;
-  border-bottom: 1px solid $nav-tabs-border-color;
-
-  // Remove background and border when printing.
-  @media print {
-    background-color: var(--nbx-body-bg) !important;
-    border-bottom: none !important;
-  }
 }
 
 // Override masonry-layout styles when printing.

netbox/project-static/styles/sidenav.scss

@@ -223,11 +223,6 @@
     font-weight: $font-weight-bold;
     color: var(--nbx-sidenav-parent-color);
 
-    &.active {
-      color: $accordion-button-active-color;
-      background: $accordion-button-active-bg;
-    }
-
     &:after {
       display: inline-block;
       margin-left: auto;
@@ -284,7 +279,7 @@
         font-size: $font-size-sm;
         color: var(--nbx-sidenav-link-color);
         white-space: nowrap;
-        transition: $transition-100ms-ease-in-out;
+        transition-duration: 0ms;
 
         &.active {
           background-color: var(--nbx-sidebar-link-active-bg);

netbox/project-static/styles/theme-dark.scss

@@ -146,7 +146,7 @@ $nav-tabs-link-active-border-color: $gray-800 $gray-800 $nav-tabs-link-active-bg
 $nav-pills-link-active-color: $component-active-color;
 $nav-pills-link-active-bg: $component-active-bg;
 
-$navbar-light-color: $gray-500;
+$navbar-light-color: $darkest;
 $navbar-light-toggler-icon-bg: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-light-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>");
 $navbar-light-toggler-border-color: $gray-700;
 

netbox/project-static/styles/theme-light.scss

@@ -2,8 +2,6 @@
 
 @import './theme-base.scss';
 
-$input-border-color: $gray-200;
-
 // Theme colors (BS5 classes)
 $primary: #337ab7;
 $secondary: $gray-600;
@@ -43,6 +41,8 @@ $theme-colors: (
 
 $light: $gray-200;
 
+$navbar-light-color: $gray-100;
+
 $card-cap-color: $gray-800;
 
 $accordion-bg: transparent;

netbox/project-static/styles/variables.scss

@@ -5,7 +5,7 @@
   --nbx-sidebar-bg: #{$gray-200};
   --nbx-sidebar-scroll: #{$gray-500};
   --nbx-sidebar-link-hover-bg: #{rgba($gray-600, 0.15)};
-  --nbx-sidebar-link-active-bg: #{$blue-100};
+  --nbx-sidebar-link-active-bg: #9cc8f8;
   --nbx-sidebar-title-color: #{$text-muted};
   --nbx-sidebar-shadow: inset 0px -25px 20px -25px rgba(0, 0, 0, 0.25);
   --nbx-breadcrumb-bg: #{$light};