From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 Aug 2022 16:44:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3668'
X-Git-Tag: live~1611
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b36df9286a03c0dd034ce0829eb69a9b66f79ea2?hp=04ff7d4ee81040f152c38ee39ba84491c91a66f3

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 9ec7fb3f4..ad0cf48ef 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -145,7 +145,7 @@ header {
 
 nav.primary {
   .btn-outline-primary {
-    @include button-outline-variant($green, $white);
+    @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
   .disabled {
@@ -190,21 +190,18 @@ nav.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 {
-      @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;
       }
     }
-    &.show .btn-outline-secondary {
-      background-color: white;
-    }
   }
 
   #inboxanchor {
@@ -650,15 +647,15 @@ legend {
    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 {
-  @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 {
-  @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 */