summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-08-31 13:18:19 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-08-31 13:22:52 -0500
commit56925ede424dddfdbad59909bba675c04c222217 (patch)
tree2dd75dc50c0b1ef3c20926eaa8ffd61a39db9c98
parent9aef0427eb9986fc27a399ea6b47e1518d6ebdac (diff)
downloadgitlab-ce-37194-fix-mr-widget-merge-button-dropdown-caret.tar.gz
Fix merge button dropdown caret horizontal alignment37194-fix-mr-widget-merge-button-dropdown-caret
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37194 It looks like this regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12601 when we switched from `fa-caret-down` to `fa-chevron-down`
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss1
-rw-r--r--changelogs/unreleased/37194-fix-mr-widget-merge-button-dropdown-caret.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 9d51c0b7a8a..f29407d2e56 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -291,6 +291,7 @@
.dropdown-toggle {
.fa {
+ margin-left: 0;
color: inherit;
}
}
diff --git a/changelogs/unreleased/37194-fix-mr-widget-merge-button-dropdown-caret.yml b/changelogs/unreleased/37194-fix-mr-widget-merge-button-dropdown-caret.yml
new file mode 100644
index 00000000000..6a2fa7ff547
--- /dev/null
+++ b/changelogs/unreleased/37194-fix-mr-widget-merge-button-dropdown-caret.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Merge when pipeline succeeds button dropdown caret icon horizontal alignment
+merge_request:
+author:
+type: fixed