Fix merge button dropdown triangle alignment (#14041)

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.

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 06b8162fda1561d870e04b4997205e4b37f772ac..34eaa83eb2d5510aa0789c329b16f02509128dda 100644 (file)
--- 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 c07c76eb928d169b6e408c34b38a29e82487323e..e49b1c5bbb966d2c2260548c675f54b2a2e3e4e8 100644 (file)
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -1792,6 +1792,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 */