core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
silverwind 2020-12-19 04:57:25 +01:00 committed by GitHub
parent 4ef751215c
commit 4aabbacdfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/repo/issue/view_content/pull.tmpl
View File

@ -343,7 +343,7 @@
</span> </span>
</button> </button>
{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}} {{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"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu"> <div class="menu">
{{if $prUnit.PullRequestsConfig.AllowMerge}} {{if $prUnit.PullRequestsConfig.AllowMerge}}

4
web_src/less/_base.less
View File

@ -1792,6 +1792,10 @@ table th[data-sortt-desc] {
.ui.selection.dropdown > .dropdown.icon { .ui.selection.dropdown > .dropdown.icon {
top: 0 !important; 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 */ /* limit width of all direct dropdown menu children */
/* https://github.com/go-gitea/gitea/pull/10835 */ /* https://github.com/go-gitea/gitea/pull/10835 */