Skip to content

Commit 4aabbac

Browse files
silverwindlafrikstechknowlogicklunny
authored
Fix merge button dropdown triangle alignment (#14041)
#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 <[email protected]> Co-authored-by: techknowlogick <[email protected]> Co-authored-by: Lunny Xiao <[email protected]>
1 parent 4ef7512 commit 4aabbac

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

templates/repo/issue/view_content/pull.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
</span>
344344
</button>
345345
{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
346-
<div class="ui dropdown icon button">
346+
<div class="ui dropdown icon button no-text">
347347
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
348348
<div class="menu">
349349
{{if $prUnit.PullRequestsConfig.AllowMerge}}

web_src/less/_base.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,6 +1792,10 @@ table th[data-sortt-desc] {
17921792
.ui.selection.dropdown > .dropdown.icon {
17931793
top: 0 !important;
17941794
}
1795+
.ui.dropdown.no-text > .dropdown.icon {
1796+
margin-left: 0 !important;
1797+
margin-right: 0 !important;
1798+
}
17951799

17961800
/* limit width of all direct dropdown menu children */
17971801
/* https://github.com/go-gitea/gitea/pull/10835 */

0 commit comments

Comments
 (0)