diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-21 18:33:28 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-21 18:33:28 +0000 |
| commit | f33624083c7d46084c35868af66b2f17b331728a (patch) | |
| tree | a5ac3f46bc52af2c6e016b4259061267693cef4f | |
| parent | b68f3e81504c4acf0dcccc53560a8598bd96bd4b (diff) | |
| parent | 3d0074a6edc22eb6840bad639c8f4fde6be89293 (diff) | |
| download | gitlab-ce-f33624083c7d46084c35868af66b2f17b331728a.tar.gz | |
Merge branch '25905-mr-when-succeeds-dropdown' into 'master'
Adds background color for disabled state to merge when succeeds dropdown
Closes #25905
See merge request !8222
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/25905-mr-when-succeeds-dropdown.yml | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index e779e65eca3..394980704ae 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -21,6 +21,14 @@ display: inline-block; float: left; + .btn-success.dropdown-toggle .fa { + color: inherit; + } + + .btn-success.dropdown-toggle:disabled { + background-color: $gl-success; + } + .accept_merge_request { &.ci-pending, &.ci-running { diff --git a/changelogs/unreleased/25905-mr-when-succeeds-dropdown.yml b/changelogs/unreleased/25905-mr-when-succeeds-dropdown.yml new file mode 100644 index 00000000000..39ce0b66768 --- /dev/null +++ b/changelogs/unreleased/25905-mr-when-succeeds-dropdown.yml @@ -0,0 +1,4 @@ +--- +title: Adds background color for disabled state to merge when succeeds dropdown +merge_request: 8222 +author: |