X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c185ef25984da52d494201d693618313f970284e..7e5cbe87ed37f9cba8224fa4049047d7f981f66a:/app/assets/stylesheets/common.scss?ds=sidebyside diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1f80a9b5b..ce83a1d93 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,27 +190,17 @@ 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; } - &: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; - &:hover { + &:hover, + &:focus { background-color: black; } @@ -656,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 */ @@ -751,10 +742,13 @@ tr.turn:hover { #sidebar .changesets { li { - cursor: pointer; - &.selected { background: $list-highlight; } /* color is derived from changeset bbox fillColor in history.js */ + + a.stretched-link > span, a:not(.stretched-link), [title] { + position: relative; + z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */ + } } .comments { @@ -1288,10 +1282,6 @@ tr.turn:hover { vertical-align: middle; } } - - a.reverse_directions { - cursor: pointer; - } } /* Rules for user images */