[BS5.3] Replace . navbar-dark by data attribute

google · Mar 15, 2024 · cdd40f4 · cdd40f4
1 parent 1929a65
commit cdd40f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/assets/scss/_search.scss b/assets/scss/_search.scss
@@ -27,7 +27,7 @@
     // Styling adjustments for the navbar
     @at-root {
       .td-navbar & {
-        color: $navbar-dark-color;
+        color: inherit;
       }
     }
   }
@@ -44,17 +44,17 @@
     &.form-control:focus {
       border-color: tint-color($primary, 95%);
       box-shadow: 0 0 0 2px tint-color($primary, 40%);
-      color: inherit;
+      color: initial;
     }
 
     // Styling adjustments for the navbar
     @at-root {
       .td-navbar & {
         border: none;
-        color: $navbar-dark-color;
+        color: inherit;
 
         @include placeholder {
-          color: $navbar-dark-color;
+          color: inherit;
         }
       }
     }

diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
@@ -82,11 +82,6 @@ $td-block-space-bottom-base: 4 * $spacer !default;
 $pagination-color: $gray-600 !default; // TODO: consider using BS default
 $pagination-disabled-color: $gray-300 !default; // TODO: consider using BS default
 
-// Navbar
-
-$navbar-dark-color: rgba($white, 0.75) !default;      // TODO: consider moving into UG SCSS
-$navbar-dark-hover-color: rgba($white, 0.5) !default; // TODO: consider moving into UG SCSS
-
 // Footer
 
 $list-inline-padding: $spacer;
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
@@ -4,8 +4,8 @@
 -}}
 {{ $baseURL := urls.Parse $.Site.Params.Baseurl -}}
 
-<nav class="td-navbar navbar-dark js-navbar-scroll
-            {{- if $cover }} td-navbar-cover {{- end }}">
+<nav class="td-navbar js-navbar-scroll
+            {{- if $cover }} td-navbar-cover {{- end }}" data-bs-theme="dark">
 <div class="container-fluid flex-column flex-md-row">
   <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
     {{- /**/ -}}