diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-21 18:33:28 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-23 10:57:28 -0200 |
| commit | c0b1a1dad6f6a13961024bd43185e0ef7c8ae595 (patch) | |
| tree | 55216dc316341c5140495ba96c304f0d1d335558 | |
| parent | b529b72d41fb3a8a1d153c85c8ae627b2a8cfa62 (diff) | |
| download | gitlab-ce-c0b1a1dad6f6a13961024bd43185e0ef7c8ae595.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 dd938f88dae..41b1b47713d 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: |