Commit 9c7c3a56 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'remove-important-clauses-from-disabled-button-styles' into 'master'

Remove !important clauses from button disabled styles

See merge request gitlab-org/gitlab!34955
parents 038953d2 f65a2a73
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
@include btn-green; @include btn-green;
} }
&.btn-inverted { &.btn-inverted:not(.disabled):not(:disabled) {
&.btn-success { &.btn-success {
@include btn-outline($white, $green-600, $green-500, $green-100, $green-700, $green-500, $green-200, $green-600, $green-800); @include btn-outline($white, $green-600, $green-500, $green-100, $green-700, $green-500, $green-200, $green-600, $green-800);
} }
...@@ -501,18 +501,19 @@ ...@@ -501,18 +501,19 @@
// All disabled buttons, regardless of color, type, etc // All disabled buttons, regardless of color, type, etc
%disabled { %disabled {
background-color: $gray-light !important; background-color: $gray-light;
border-color: $gray-200 !important; border-color: $gray-200;
color: $gl-text-color-disabled !important; color: $gl-text-color-disabled;
opacity: 1 !important; opacity: 1;
cursor: default !important; text-decoration: none;
cursor: default;
&.cursor-not-allowed { &.cursor-not-allowed {
cursor: not-allowed !important; cursor: not-allowed;
} }
i { i {
color: $gl-text-color-disabled !important; color: $gl-text-color-disabled;
} }
} }
...@@ -526,6 +527,10 @@ fieldset[disabled] .btn, ...@@ -526,6 +527,10 @@ fieldset[disabled] .btn,
&:hover { &:hover {
@extend %disabled; @extend %disabled;
} }
&.btn-link {
background-color: transparent;
}
} }
[readonly] { [readonly] {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment