diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-19 15:45:07 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-19 16:46:24 -0500 |
| commit | 244a15b03663061a85ce3c625c20bcfb483a7d36 (patch) | |
| tree | 002703423365dc3e4ca296bcc3b0f2aebb5e978e | |
| parent | b47b0e4b6289eeb4d12983b796877f67d16cfd22 (diff) | |
| download | gitlab-ce-244a15b03663061a85ce3c625c20bcfb483a7d36.tar.gz | |
Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'
Fix cancel automatic merge button height
Closes #48052
See merge request gitlab-org/gitlab-ce!19977
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index f50ca677800..9c3b08b0625 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -46,6 +46,7 @@ .btn { font-size: $gl-font-size; + max-height: 26px; &[disabled] { opacity: 0.3; |