summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-26 20:18:04 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-07-04 11:29:29 +0100
commitb4c8d401904b39472b43af77ace1de816b9cbc30 (patch)
tree7b0137fded28be7a946ced16e8597b8d738b8b53
parentf1d2f6cbc82c12cb16989e35068e17cbeb01f883 (diff)
downloadgitlab-ce-b4c8d401904b39472b43af77ace1de816b9cbc30.tar.gz
Merge branch 'revert-merge-request-widget-button-height' into 'master'
Revert merge request widget button max height Closes #48441 See merge request gitlab-org/gitlab-ce!20175
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss1
-rw-r--r--changelogs/unreleased/revert-merge-request-widget-button-height.yml5
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 9c3b08b0625..f50ca677800 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -46,7 +46,6 @@
.btn {
font-size: $gl-font-size;
- max-height: 26px;
&[disabled] {
opacity: 0.3;
diff --git a/changelogs/unreleased/revert-merge-request-widget-button-height.yml b/changelogs/unreleased/revert-merge-request-widget-button-height.yml
new file mode 100644
index 00000000000..7c400a4a2b2
--- /dev/null
+++ b/changelogs/unreleased/revert-merge-request-widget-button-height.yml
@@ -0,0 +1,5 @@
+---
+title: Revert merge request widget button max height
+merge_request: 20175
+author: George Tsiolis
+type: fixed