pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Work around fomantic 2.8.5 bugs (#11767)

Browse source 
Work around fomantic 2.8.5 bugs 

Closes #11759

Related fomantic/Fomantic-UI#1372 and fomantic/Fomantic-UI#1473
This commit is contained in:
Cirno the Strongest 2020-06-07 20:25:52 +02:00 committed by GitHub
parent 479ef5c379
commit 880ae454db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 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

@ -283,7 +283,7 @@
</button> </button>
<div class="ui dropdown icon button"> <div class="ui dropdown icon button">
<i class="dropdown icon"></i> <i class="dropdown icon"></i>
<div class="menu"> <div class="menu left">
{{if $prUnit.PullRequestsConfig.AllowMerge}} {{if $prUnit.PullRequestsConfig.AllowMerge}}
<div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div> <div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div>
{{end}} {{end}}

8
web_src/less/_base.less
View file

@ -1048,6 +1048,14 @@ i.icon.centerlock {
top: 1.45em; top: 1.45em;
} }
// temporary workaround for fomantic 2.8.5 bug
// https://github.com/go-gitea/gitea/pull/11767
i.icon,
i.icons {
vertical-align: unset;
line-height: unset;
}
.ui.label { .ui.label {
padding: .3em .5em; padding: .3em .5em;
} }