Further tweaks to the navigation dropdown button colours

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 5fc4da8d828146069789ffdbff1b70a201b69e1d..540c887b3c9c0480f2b5963864da86c158529cfd 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -190,6 +190,32 @@ nav.primary {
   .btn-outline-primary {
     @include button-outline-variant($green, $white);
   }
+
+  .disabled {
+    .btn-outline-primary {
+      color: $grey;
+      cursor: default;
+
+      .caret {
+        border-top-color: $grey;
+      }
+
+      &:hover {
+        background-color: lighten($green, 30%);
+      }
+    }
+  }
+
+  // Small tweaks to the toggle to stop the primary colour showing through
+  // when the menu is shown
+  .show > .btn-outline-primary.dropdown-toggle {
+    background-color: $green;
+    border-color: $green;
+
+    &:focus {
+      box-shadow: 0 0 0 0.2rem fade-out($green, 0.5);
+    }
+  }
 }
 
 nav.secondary {
@@ -214,8 +240,20 @@ nav.secondary {
   .user-menu {
     .btn-outline-secondary {
       @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey);
-      // @include button-outline-variant($grey, $grey, white, $grey);
       border-color: $grey;
+      &:hover {
+        border-color: $grey;
+      }
+      &:focus {
+        background-color: white;
+        box-shadow: none;
+      }
+    }
+    &.show .btn-outline-secondary {
+      background-color: white;
+      &:focus {
+        box-shadow: none;
+      }
     }
   }