Skip to content

Commit 6c81b73

Browse files
CirnoTzeripathtechknowlogick
authored
Update Fomantic-UI to 2.8.6 and remove old workarounds (#11933)
Co-authored-by: zeripath <[email protected]> Co-authored-by: techknowlogick <[email protected]>
1 parent 6c38f37 commit 6c81b73

File tree

6 files changed

+14
-35
lines changed

6 files changed

+14
-35
lines changed

package-lock.json

Lines changed: 10 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"dropzone": "5.7.1",
2121
"fast-glob": "3.2.2",
2222
"file-loader": "6.0.0",
23-
"fomantic-ui": "2.8.5",
23+
"fomantic-ui": "2.8.6",
2424
"highlight.js": "10.0.3",
2525
"jquery": "3.5.1",
2626
"jquery.are-you-sure": "1.9.0",

semantic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.8.5",
2+
"version": "2.8.6",
33
"base": "node_modules/fomantic-ui",
44
"paths": {
55
"source": {

templates/repo/issue/view_content/pull.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
</div>
195195
{{end}}
196196
{{end}}
197-
197+
198198
{{$canAutoMerge = true}}
199199
{{if (gt .Issue.PullRequest.CommitsBehind 0)}}
200200
<div class="ui divider"></div>
@@ -312,7 +312,7 @@
312312
</button>
313313
<div class="ui dropdown icon button">
314314
<i class="dropdown icon"></i>
315-
<div class="menu left">
315+
<div class="menu">
316316
{{if $prUnit.PullRequestsConfig.AllowMerge}}
317317
<div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div>
318318
{{end}}

web_src/less/_base.less

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,14 +1048,6 @@ i.icon.centerlock {
10481048
top: 1em;
10491049
}
10501050

1051-
// temporary workaround for fomantic 2.8.5 bug
1052-
// https://github.com/go-gitea/gitea/pull/11767
1053-
i.icon,
1054-
i.icons {
1055-
vertical-align: unset;
1056-
line-height: unset;
1057-
}
1058-
10591051
.ui.label {
10601052
padding: .3em .5em;
10611053
}

web_src/less/_repository.less

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,9 +652,6 @@
652652
margin-left: 10px;
653653
margin-top: 10px;
654654
}
655-
.icon-octicon {
656-
padding-left: 2px;
657-
}
658655
.branch-update.grid {
659656
.row {
660657
padding-bottom: 1rem;

0 commit comments

Comments
 (0)