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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 2682af00a40853cea4a3419c4bedd0329e73a3a7..75ed514eeda38a73a7ebb7f57090a9d5b2ace598 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -145,7 +145,7 @@ header {
 
 nav.primary {
   .btn-outline-primary {
 
 nav.primary {
   .btn-outline-primary {

-    @include button-outline-variant($green, $white);
+    @include button-outline-variant($green, $color-hover: $white, $active-color: $white);

   }
 
   .disabled {
   }
 
   .disabled {


@@ -190,27 +190,17 @@ nav.secondary {
 
   .login-menu {
     .btn-outline-secondary {
 
   .login-menu {
     .btn-outline-secondary {

-      @include button-outline-variant($darkgrey, $white, null, null, $white);
+      @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white);

     }
   }
 
   .user-menu {
     .btn-outline-secondary {
     }
   }
 
   .user-menu {
     .btn-outline-secondary {

-      @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey);
+      @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);

       border-color: $grey;
       &:hover {
         border-color: $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;
-      }

     }
   }
 
     }
   }
 


@@ -283,7 +273,8 @@ body.compact-nav {
   margin-bottom: 10px;
   outline: none;
 
   margin-bottom: 10px;
   outline: none;
 

-  &:hover {
+  &:hover,
+  &:focus {

     background-color: black;
   }
 
     background-color: black;
   }
 


@@ -656,15 +647,15 @@ legend {
    reconsider our colours at some point with that in mind. */
 
 .btn-primary {
    reconsider our colours at some point with that in mind. */
 
 .btn-primary {

-  @include button-variant($primary, $primary, $white, null, null, $white, null, null, $white, null, null, $white);
+  @include button-variant($primary, $primary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);

 }
 
 .btn-secondary {
 }
 
 .btn-secondary {

-  @include button-variant($secondary, $secondary, $white, null, null, $white, null, null, $white, null, null, $white);
+  @include button-variant($secondary, $secondary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);

 }
 
 .btn-outline-secondary {
 }
 
 .btn-outline-secondary {

-  @include button-outline-variant($secondary, $white, null, null, $white);
+  @include button-outline-variant($secondary, $color-hover: $white, $active-color: $white);

 }
 
 /* Rules for the search and direction forms */
 }
 
 /* Rules for the search and direction forms */


@@ -751,10 +742,13 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    cursor: pointer;
-

     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */

+
+    a:not(.stretched-link), [title] {
+      position: relative;
+      z-index: 1;
+    }

   }
 
   .comments {
   }
 
   .comments {