Adjust navbar and footer colours

diff --git a/css/bootstrap/_navbar.scss b/css/bootstrap/_navbar.scss
index cf5b667..b681ce4 100644 (file)
--- a/css/bootstrap/_navbar.scss
+++ b/css/bootstrap/_navbar.scss
@@ -243,6 +243,7 @@
 
       @include hover-focus() {
         color: $navbar-light-hover-color;
+        background-color: $navbar-light-hover-bg; // Nick
       }
 
       &.disabled {
@@ -255,6 +256,7 @@
     .nav-link.show,
     .nav-link.active {
       color: $navbar-light-active-color;
+      background-color: $navbar-light-active-bg; // Nick
     }
   }
 
@@ -295,6 +297,7 @@
 
       @include hover-focus() {
         color: $navbar-dark-hover-color;
+        background-color: $navbar-dark-hover-bg; // Nick
       }
 
       &.disabled {
@@ -307,6 +310,7 @@
     .nav-link.show,
     .nav-link.active {
       color: $navbar-dark-active-color;
+      background-color: $navbar-dark-active-bg; // Nick
     }
   }
 

diff --git a/css/bootstrap/_variables.scss b/css/bootstrap/_variables.scss
index 7d8fb3b..dc1fd92 100644 (file)
--- a/css/bootstrap/_variables.scss
+++ b/css/bootstrap/_variables.scss
@@ -64,9 +64,9 @@ $colors: map-merge(
   $colors
 );
 
-$primary:       $blue !default;
+$primary:       #00a000 !default; //$blue !default;
 $secondary:     $gray-600 !default;
-$success:       $green !default;
+$success:       #ff8000 !default; //$green !default;
 $info:          $cyan !default;
 $warning:       $yellow !default;
 $danger:        $red !default;
@@ -715,7 +715,7 @@ $nav-divider-margin-y:              $spacer * .5 !default;
 
 // Navbar
 
-$navbar-padding-y:                  $spacer * .5 !default;
+$navbar-padding-y:                  0 !default; //$spacer * .5 !default;
 $navbar-padding-x:                  $spacer !default;
 
 $navbar-nav-link-padding-x:         .5rem !default;
@@ -733,16 +733,20 @@ $navbar-toggler-border-radius:      $btn-border-radius !default;
 
 $navbar-nav-scroll-max-height:      75vh !default;
 
-$navbar-dark-color:                 rgba($white, .5) !default;
-$navbar-dark-hover-color:           rgba($white, .75) !default;
+$navbar-dark-color:                 $white !default; //rgba($white, .5) !default;
+$navbar-dark-hover-color:           $black !default; //rgba($white, .75) !default;
+$navbar-dark-hover-bg:              $gray-400 !default; // Nick
 $navbar-dark-active-color:          $white !default;
+$navbar-dark-active-bg:             darken(theme-color("primary"), 6%) !default; // Nick
 $navbar-dark-disabled-color:        rgba($white, .25) !default;
 $navbar-dark-toggler-icon-bg:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'><path stroke='#{$navbar-dark-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
 $navbar-dark-toggler-border-color:  rgba($white, .1) !default;
 
-$navbar-light-color:                rgba($black, .5) !default;
-$navbar-light-hover-color:          rgba($black, .7) !default;
+$navbar-light-color:                $black !default; //rgba($black, .5) !default;
+$navbar-light-hover-color:          $white !default; //rgba($black, .7) !default;
+$navbar-light-hover-bg:             $gray-600 !default; // Nick
 $navbar-light-active-color:         rgba($black, .9) !default;
+$navbar-light-active-bg:            lighten(theme-color("primary"), 6%) !default; // Nick
 $navbar-light-disabled-color:       rgba($black, .3) !default;
 $navbar-light-toggler-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='30' height='30' 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>") !default;
 $navbar-light-toggler-border-color: rgba($black, .1) !default;

diff --git a/css/bootstrap/utilities/_background.scss b/css/bootstrap/utilities/_background.scss
index 3accbc4..0291ade 100644 (file)
--- a/css/bootstrap/utilities/_background.scss
+++ b/css/bootstrap/utilities/_background.scss
@@ -4,6 +4,11 @@
   @include bg-variant(".bg-#{$color}", $value, true);
 }
 
+// Nick
+@each $color, $value in $grays {
+  @include bg-variant(".bg-gray-#{$color}", $value, true);
+}
+
 @if $enable-gradients {
   @each $color, $value in $theme-colors {
     @include bg-gradient-variant(".bg-gradient-#{$color}", $value, true);

diff --git a/navbar.jst b/navbar.jst
index 69e15cc..012bb1f 100644 (file)
--- a/navbar.jst
+++ b/navbar.jst
@@ -110,7 +110,7 @@ return async (env, head, body, scripts) => {
           }
         }
       }
-      nav.navbar.navbar-expand-lg.navbar-light.bg-light {
+      nav.navbar.navbar-expand-lg.navbar-dark.bg-primary {
         div.container { //div(style="padding-left: calc(100vw - 100%);") {
           //a.navbar-brand(href="#") {'Navbar'}
           //' '
@@ -178,13 +178,13 @@ return async (env, head, body, scripts) => {
           }
         }
       }
-      div(style="padding-left: calc(100vw - 100%); margin-bottom: 50px;") {
+      div(style="padding-left: calc(100vw - 100%); margin-top: 20px; margin-bottom: 40px;") {
         div.container {
           await body(_out)
         }
       }
-      div.footer(style="padding-left: calc(100vw - 100%);") {
-        div.container { //-fluid") {
+      div.footer.bg-gray-400(style="padding-left: calc(100vw - 100%); padding-top: 30px; padding-bottom: 30px;") {
+        div.container {
           a(rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/") {
             img(alt="Creative Commons License" style="border-width:0" src="/images/by-sa_3.0_88x31.png") {}
           }