diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-10 19:55:02 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-16 15:34:04 +0300 |
| commit | cced2982b20cf526712ca78f28a8a3532d65b534 (patch) | |
| tree | 07de2475eef99e3f4b6be78a1824bc60e3623482 | |
| parent | 4f86e36a008b3b3d3efc1ffe34e5204ee487398a (diff) | |
Merge branch '29263-merge-button-color' into 'master'
Consistent button colors for disabled buttons
Closes #29263 and #29221
See merge request !9848
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/29263-merge-button-color.yml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 887ab481de4..c21abd5e4b3 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 { diff --git a/changelogs/unreleased/29263-merge-button-color.yml b/changelogs/unreleased/29263-merge-button-color.yml new file mode 100644 index 00000000000..2d0625483a4 --- /dev/null +++ b/changelogs/unreleased/29263-merge-button-color.yml @@ -0,0 +1,4 @@ +--- +title: ensure MR widget dropdown is same color as button +merge_request: +author: |