diff options
author | Andrew Fontaine <afontaine@gitlab.com> | 2019-07-16 15:18:26 -0400 |
---|---|---|
committer | Andrew Fontaine <afontaine@gitlab.com> | 2019-07-19 09:32:42 -0400 |
commit | b637b806026e33e6d2f0ce652d12e3592d3b3b43 (patch) | |
tree | 0b713bd552a3d701b2dc6ebd76653d9e6247408a | |
parent | 6597416b9c0c3d7498e64de329244e927826d7d7 (diff) | |
download | gitlab-ce-b637b806026e33e6d2f0ce652d12e3592d3b3b43.tar.gz |
Remove Not Disabled Selectors on Buttons
As far as I can tell, there's no reason for the
`:not(.disabled):not(:disabled)` check here.
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 86 |
1 files changed, 42 insertions, 44 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index e0b6da31261..96a4060c06b 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -49,38 +49,37 @@ color: $text; } - &:not(:disabled):not(.disabled) { - &:hover { - box-shadow: inset 0 0 0 1px $hover-border, 0 2px 2px 0 $gl-btn-hover-shadow-light; - } + &:hover { + box-shadow: inset 0 0 0 1px $hover-border, 0 2px 2px 0 $gl-btn-hover-shadow-light; + } - &:focus { - box-shadow: inset 0 0 0 1px $hover-border, 0 0 4px 1px $blue-300; - } + &:focus { + box-shadow: inset 0 0 0 1px $hover-border, 0 0 4px 1px $blue-300; + } - &:hover, - &:focus { - background-color: $hover-background; - border-color: $hover-border; - color: $hover-text; + &:hover, + &:focus { + background-color: $hover-background; + border-color: $hover-border; + color: $hover-text; - > .icon { - color: $hover-text; - } + > .icon { + color: $hover-text; } + } - &:active, - &:active:focus { - background-color: $active-background; - border-color: $active-border; - box-shadow: inset 0 0 0 1px $hover-border, inset 0 2px 4px 0 rgba($black, 0.2); - color: $active-text; + &:active, + &:active:focus { + background-color: $active-background; + border-color: $active-border; + box-shadow: inset 0 0 0 1px $hover-border, inset 0 2px 4px 0 rgba($black, 0.2); + color: $active-text; - > .icon { - color: $active-text; - } + > .icon { + color: $active-text; } } + } @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color, $hover-shadow-color: $gl-btn-hover-shadow-dark) { @@ -88,30 +87,29 @@ border-color: $border-light; color: $color; - &:not(:disabled):not(.disabled) { - &:hover { - box-shadow: inset 0 0 0 1px $border-normal, 0 2px 2px 0 $hover-shadow-color; - } + &:hover { + box-shadow: inset 0 0 0 1px $border-normal, 0 2px 2px 0 $hover-shadow-color; + } - &:focus { - box-shadow: inset 0 0 0 1px $border-normal, 0 0 4px 1px $blue-300; - } + &:focus { + box-shadow: inset 0 0 0 1px $border-normal, 0 0 4px 1px $blue-300; + } - &:hover, - &:focus { - background-color: $normal; - border-color: $border-normal; - color: $color; - } + &:hover, + &:focus { + background-color: $normal; + border-color: $border-normal; + color: $color; + } - &:active, - &.active { - box-shadow: inset 0 2px 4px 0 $gl-btn-hover-shadow-dark; - background-color: $dark; - border-color: $border-dark; - color: $color; - } + &:active, + &.active { + box-shadow: inset 0 2px 4px 0 $gl-btn-hover-shadow-dark; + background-color: $dark; + border-color: $border-dark; + color: $color; } + } @mixin btn-green { |