diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-03-10 16:28:57 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-03-10 22:08:58 +1100 |
| commit | 3c53f66c7e57269595f2f4d0cf872e948cd467fd (patch) | |
| tree | 3949f5220139d72b86e43af8a5a7eb73826294c5 | |
| parent | 7867b9929ce8e03eda6da4c87e24e59210b1ee81 (diff) | |
| download | gitlab-ce-29263-merge-button-color.tar.gz | |
Consistent button colors for disabled buttons29263-merge-button-color
| -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 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 { 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: |