diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-15 11:40:30 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-15 11:40:30 +0300 |
| commit | b95cf314eddf18cd50ad02fb944909ed31c87881 (patch) | |
| tree | 06fcf4bdc172cd6d205fc818667ad09793c53cb1 /app/assets | |
| parent | 4b50e4d5edf6f89a4833b402d97edf45cdc9eac1 (diff) | |
| parent | 09e58d3f8a965992f2abc72246bd405c984c948c (diff) | |
Merge branch 'ce-1979-fe-multiple-approval-rules' into 'master'
CE Port of Multiple merge request approval rules
See merge request gitlab-org/gitlab-ce!25193
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index d164cc56e44..cb2c8879c5f 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -166,7 +166,8 @@ @include btn-outline($white-light, $green-600, $green-500, $green-500, $white-light, $green-600, $green-600, $green-700); } - &.btn-remove { + &.btn-remove, + &.btn-danger { @include btn-outline($white-light, $red-500, $red-500, $red-500, $white-light, $red-600, $red-600, $red-700); } |