forks/forgejo
1
0
Fork 0
Code Releases Activity

Update Fomantic-UI to 2.8.6 and remove old workarounds (#11933)

Browse source 
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
Cirno the Strongest 2020-06-18 03:20:07 +02:00 committed by GitHub
parent 6c38f371ea
commit 6c81b738f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
package-lock.json generated
View file

@ -1048,23 +1048,13 @@
}, },
"dependencies": { "dependencies": {
"@octokit/request-error": { "@octokit/request-error": {
"version": "2.0.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz", "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz",
"integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==", "integrity": "sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==",
"requires": { "requires": {
"@octokit/types": "^4.0.1", "@octokit/types": "^5.0.1",
"deprecation": "^2.0.0", "deprecation": "^2.0.0",
"once": "^1.4.0" "once": "^1.4.0"
},
"dependencies": {
"@octokit/types": {
"version": "4.1.10",
"resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.1.10.tgz",
"integrity": "sha512-/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ==",
"requires": {
"@types/node": ">= 8"
}
}
} }
}, },
"universal-user-agent": { "universal-user-agent": {
@ -1121,9 +1111,9 @@
} }
}, },
"@octokit/types": { "@octokit/types": {
"version": "5.0.0", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.0.0.tgz", "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz",
"integrity": "sha512-3LVS+MbeqwSd5G4KS8123cZz+hWomsiGeMnQ/QJIBFDwL/YHX8kkr0FZXrgWEMO7Fgi2/VOrhbiFnk9sZ+s4qA==", "integrity": "sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA==",
"requires": { "requires": {
"@types/node": ">= 8" "@types/node": ">= 8"
} }
@ -5466,9 +5456,9 @@
} }
}, },
"fomantic-ui": { "fomantic-ui": {
"version": "2.8.5", "version": "2.8.6",
"resolved": "https://registry.npmjs.org/fomantic-ui/-/fomantic-ui-2.8.5.tgz", "resolved": "https://registry.npmjs.org/fomantic-ui/-/fomantic-ui-2.8.6.tgz",
"integrity": "sha512-VvnralD84d6sRfp/FYYURLeNXi7QeKfLje5En2MNGRFRfR3t+J3KEPSk7g8NBP4KJWsW3Hr8Lne0p9ErA05aug==", "integrity": "sha512-4/CU9XeaX42LHWmajOxJf2f3vXK++qOG5nhEv9Gjw7T7dA4MzI5I5XSpoRkQ2L5u3v4c+iiPKJAJpExWtvh23w==",
"requires": { "requires": {
"@octokit/rest": "^16.16.0", "@octokit/rest": "^16.16.0",
"better-console": "1.0.1", "better-console": "1.0.1",

2
package.json
View file

@ -20,7 +20,7 @@
"dropzone": "5.7.1", "dropzone": "5.7.1",
"fast-glob": "3.2.2", "fast-glob": "3.2.2",
"file-loader": "6.0.0", "file-loader": "6.0.0",
"fomantic-ui": "2.8.5", "fomantic-ui": "2.8.6",
"highlight.js": "10.0.3", "highlight.js": "10.0.3",
"jquery": "3.5.1", "jquery": "3.5.1",
"jquery.are-you-sure": "1.9.0", "jquery.are-you-sure": "1.9.0",

2
semantic.json
View file

@ -1,5 +1,5 @@
{ {
"version": "2.8.5", "version": "2.8.6",
"base": "node_modules/fomantic-ui", "base": "node_modules/fomantic-ui",
"paths": { "paths": {
"source": { "source": {

4
templates/repo/issue/view_content/pull.tmpl
View file

@ -194,7 +194,7 @@
</div> </div>
{{end}} {{end}}
{{end}} {{end}}
{{$canAutoMerge = true}} {{$canAutoMerge = true}}
{{if (gt .Issue.PullRequest.CommitsBehind 0)}} {{if (gt .Issue.PullRequest.CommitsBehind 0)}}
<div class="ui divider"></div> <div class="ui divider"></div>
@ -312,7 +312,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 left"> <div class="menu">
{{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,14 +1048,6 @@ i.icon.centerlock {
top: 1em; top: 1em;
} }
// 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;
} }

3
web_src/less/_repository.less
View file

@ -652,9 +652,6 @@
margin-left: 10px; margin-left: 10px;
margin-top: 10px; margin-top: 10px;
} }
.icon-octicon {
padding-left: 2px;
}
.branch-update.grid { .branch-update.grid {
.row { .row {
padding-bottom: 1rem; padding-bottom: 1rem;