cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use named arguments for button-variant mixins

Browse source 
This is much clearer than relying on positional arguments, and is
also required for future upgrades to bootstrap.
This commit is contained in:
Andy Allan 2022-08-31 14:40:01 +01:00
parent a9b77d60c8
commit f6dd80e87d
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/common.scss
View file

@ -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 */