Merge remote-tracking branch 'upstream/pull/2526'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c0e0a3686856ba5e071fbd961f7250f72e0a3235..d3382eb3f24559a3466c85eca1f0d9cbb2f9342c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -205,6 +205,17 @@ nav.primary {
       }
     }
   }
+
+  // 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 {
@@ -233,6 +244,16 @@ nav.secondary {
       &:hover {
         border-color: $grey;
       }
+      &:focus {
+        background-color: white;
+        box-shadow: none;
+      }
+    }
+    &.show .btn-outline-secondary {
+      background-color: white;
+      &:focus {
+        box-shadow: none;
+      }
     }
   }
 
@@ -257,6 +278,15 @@ nav.secondary {
   }
 }
 
+nav.primary, nav.secondary {
+  .dropdown-item {
+    &:hover, &:active {
+      background-color: $green;
+      color: white;
+    }
+  }
+}
+
 #compact-secondary-nav {
   display: none;
 }
@@ -872,6 +902,7 @@ header .search_forms,
     padding: 5px 20px 10px 15px;
     width: 100%;
     border-collapse: separate;
+    border-spacing: 0;
 }
 
 div.direction {
@@ -996,6 +1027,7 @@ tr.turn:hover {
     border-radius: 3px;
     table-layout: fixed;
     border-collapse: separate;
+    border-spacing: 0;
 
     th, td {
       border-bottom: 1px solid $grey;