mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-05 23:34:19 -04:00
Merge pull request #2088 from nanoant/patch/further-layout-fixes
Further layout fixes
This commit is contained in:
commit
c4bab163cb
@ -514,11 +514,11 @@ func runWeb(ctx *cli.Context) {
|
||||
m.Get("/edit/:tagname", repo.EditRelease)
|
||||
m.Post("/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost)
|
||||
m.Post("/delete", repo.DeleteRelease)
|
||||
}, reqRepoAdmin, middleware.RepoRef())
|
||||
}, reqRepoAdmin)
|
||||
|
||||
m.Combo("/compare/*").Get(repo.CompareAndPullRequest).
|
||||
Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost)
|
||||
}, reqSignIn, middleware.RepoAssignment())
|
||||
}, reqSignIn, middleware.RepoAssignment(), middleware.RepoRef())
|
||||
|
||||
m.Group("/:username/:reponame", func() {
|
||||
m.Group("", func() {
|
||||
|
@ -5,9 +5,7 @@
|
||||
font-style: normal;
|
||||
}
|
||||
.octicon,
|
||||
.mega-octicon,
|
||||
.icon.octicon,
|
||||
.icon.mega-octicon {
|
||||
.mega-octicon {
|
||||
font: normal normal normal 16px/1 octicons;
|
||||
display: inline-block;
|
||||
text-decoration: none;
|
||||
@ -1052,6 +1050,7 @@ footer .container .links > *:first-child {
|
||||
.octicon.icon,
|
||||
.mega-octicon.icon {
|
||||
font-family: octicons;
|
||||
font-size: 16px;
|
||||
opacity: 1 !important;
|
||||
}
|
||||
.sr-only {
|
||||
|
@ -313,9 +313,11 @@ footer {
|
||||
.generate-img(@n, (@i + 1));
|
||||
}
|
||||
|
||||
// ensure Semantic UI .icon font family and 14px size does not apply to .icon.octicon
|
||||
.octicon.icon,
|
||||
.mega-octicon.icon {
|
||||
font-family: octicons;
|
||||
font-size: 16px;
|
||||
opacity: 1 !important;
|
||||
}
|
||||
|
||||
|
@ -14,9 +14,7 @@
|
||||
|
||||
// .octicon is optimized for 16px.
|
||||
// .mega-octicon is optimized for 32px but can be used larger.
|
||||
.octicon, .mega-octicon,
|
||||
// ensure Semantic UI .icon of 14px does not apply to .icon.octicon:
|
||||
.icon.octicon, .icon.mega-octicon {
|
||||
.octicon, .mega-octicon {
|
||||
font: normal normal normal 16px/1 octicons;
|
||||
display: inline-block;
|
||||
text-decoration: none;
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository commits">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
{{template "repo/commits_table" .}}
|
||||
</div>
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository forks">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<h2 class="ui dividing header">
|
||||
{{.i18n.Tr "repo.forks"}}
|
||||
|
@ -45,3 +45,37 @@
|
||||
</div><!-- end grid -->
|
||||
</div><!-- end container -->
|
||||
{{end}}
|
||||
{{if not .IsBareRepo}}
|
||||
<div class="ui tabs container">
|
||||
<div class="ui tabular menu navbar">
|
||||
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
|
||||
<i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
|
||||
</a>
|
||||
<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
|
||||
<i class="icon octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if eq 0 .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
|
||||
<i class="icon octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui {{if eq 0 .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsCommits}}active{{end}} item" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}">
|
||||
<i class="icon octicon octicon-history"></i> {{.i18n.Tr "repo.commits"}} <span class="ui {{if eq 0 .CommitsCount}}gray{{else}}blue{{end}} small label">{{.CommitsCount}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
|
||||
<i class="icon octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if eq 0 .Repository.NumTags}}gray{{else}}blue{{end}} small label">{{.Repository.NumTags}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki">
|
||||
<i class="icon octicon octicon-book"></i> {{.i18n.Tr "repo.wiki"}}
|
||||
</a>
|
||||
{{if .IsRepositoryAdmin}}
|
||||
<div class="right menu">
|
||||
<a class="{{if .PageIsSettings}}active{{end}} item" href="{{.RepoLink}}/settings">
|
||||
<i class="icon octicon octicon-tools"></i> {{.i18n.Tr "repo.settings"}}
|
||||
</a>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui tabs divider"></div>
|
||||
{{else}}
|
||||
<div class="ui divider"></div>
|
||||
{{end}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository file list">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<p id="repo-desc">
|
||||
{{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository labels">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="navbar">
|
||||
{{template "repo/issue/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="navbar">
|
||||
{{template "repo/issue/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository milestones">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="navbar">
|
||||
{{template "repo/issue/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository release">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
{{template "base/alert" .}}
|
||||
<h2 class="ui header">
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository new release">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<h2 class="ui dividing header">
|
||||
{{if .PageIsEditRelease}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository settings collaboration">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
{{template "repo/settings/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository settings">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
{{template "repo/settings/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository settings edit githook">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
{{template "repo/settings/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository settings githooks">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
{{template "repo/settings/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository settings new webhook">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
{{template "repo/settings/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository settings webhooks">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
{{template "repo/settings/navbar" .}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository settings options">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
{{template "repo/settings/navbar" .}}
|
||||
|
@ -1,34 +0,0 @@
|
||||
{{if not .IsBareRepo}}
|
||||
<div class="ui tabs container">
|
||||
<div class="ui tabular menu navbar">
|
||||
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
|
||||
<i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
|
||||
</a>
|
||||
<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
|
||||
<i class="icon octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if eq 0 .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
|
||||
<i class="icon octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui {{if eq 0 .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsCommits}}active{{end}} item" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}">
|
||||
<i class="icon octicon octicon-history"></i> {{.i18n.Tr "repo.commits"}} <span class="ui {{if eq 0 .CommitsCount}}gray{{else}}blue{{end}} small label">{{.CommitsCount}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
|
||||
<i class="icon octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if eq 0 .Repository.NumTags}}gray{{else}}blue{{end}} small label">{{.Repository.NumTags}}</span>
|
||||
</a>
|
||||
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki">
|
||||
<i class="icon octicon octicon-book"></i> {{.i18n.Tr "repo.wiki"}}
|
||||
</a>
|
||||
{{if .IsRepositoryAdmin}}
|
||||
<div class="right menu">
|
||||
<a class="{{if .PageIsSettings}}active{{end}} item" href="{{.RepoLink}}/settings">
|
||||
<i class="icon octicon octicon-tools"></i> {{.i18n.Tr "repo.settings"}}
|
||||
</a>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui tabs divider"></div>
|
||||
{{else}}
|
||||
<div class="ui divider"></div>
|
||||
{{end}}
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository watchers">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<h2 class="ui dividing header">
|
||||
{{if .PageIsWatchers}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository wiki new">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
{{template "base/alert" .}}
|
||||
<div class="ui header">
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository wiki pages">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui header">
|
||||
{{.i18n.Tr "repo.wiki.pages"}}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository wiki start">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui center segment">
|
||||
<span class="mega-octicon octicon-book"></span>
|
||||
|
@ -1,7 +1,6 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="repository wiki view">
|
||||
{{template "repo/header" .}}
|
||||
{{template "repo/sidebar" .}}
|
||||
<div class="ui container">
|
||||
<div class="ui grid">
|
||||
<div class="ui ten wide column">
|
||||
|
Loading…
Reference in New Issue
Block a user