diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-19 15:45:07 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-19 15:45:07 +0000 |
| commit | 5ebe1551e42edaa0820f0a6d14afdd08aa0ff6fd (patch) | |
| tree | 0fdf3dbc86f38e33f50ec3339a27fcd2057b857a | |
| parent | e7549b9882560cf8cc3e61f67acbf69cf3c4c7d4 (diff) | |
| parent | 59b91de52de1e2cce416825887ec2f9ca8fe019b (diff) | |
| download | gitlab-ce-5ebe1551e42edaa0820f0a6d14afdd08aa0ff6fd.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 99fe4a578be..596d3aa171c 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; |