From d3c8c1748e02ee2842af216af722d97695a94e03 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 17 Dec 2020 20:42:56 +0100
Subject: [PATCH] Fix merge button dropdown triangle alignment

https://github.com/go-gitea/gitea/pull/14028 had improved dropdown
triangle display for buttons with text but had regressed it for buttons
without. Fix this by adding a class to prevent horizontal margin adjustment.
---
 templates/repo/issue/view_content/pull.tmpl | 2 +-
 web_src/less/_base.less                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 06b8162fda156..34eaa83eb2d55 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -343,7 +343,7 @@
 										</span>
 									</button>
 									{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
-										<div class="ui dropdown icon button">
+										<div class="ui dropdown icon button no-text">
 											{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 											<div class="menu">
 												{{if $prUnit.PullRequestsConfig.AllowMerge}}
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 9a7aa28d4b7fe..7487ee4c7e233 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -1791,6 +1791,10 @@ table th[data-sortt-desc] {
 .ui.selection.dropdown > .dropdown.icon {
   top: 0 !important;
 }
+.ui.dropdown.no-text > .dropdown.icon {
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+}
 
 /* limit width of all direct dropdown menu children */
 /* https://github.com/go-gitea/gitea/pull/10835 */