diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-10 19:55:02 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-10 19:55:02 +0300 |
| commit | daa4590ca3e64220bff1a4d94f9d1a5ddadf42fa (patch) | |
| tree | 31410a1eecd4f6bd9250be18eb7b2c7a71741cbb /app | |
| parent | c8bbf9a896ff9d163e59a282906d9bde8e892dba (diff) | |
| parent | 3c53f66c7e57269595f2f4d0cf872e948cd467fd (diff) | |
Merge branch '29263-merge-button-color' into 'master'
Consistent button colors for disabled buttons
Closes #29263 and #29221
See merge request !9848
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index fe8b37d2c6e..186bb9ac616 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -43,7 +43,7 @@ white-space: nowrap; &[disabled] { - background-color: $input-bg-disabled; + opacity: .65; cursor: not-allowed; } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index d3496e19dde..7c3172421c1 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -24,10 +24,6 @@ color: inherit; } - .btn-success.dropdown-toggle:disabled { - background-color: $gl-success; - } - .accept-merge-request { &.ci-pending, &.ci-running { |