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

UI: Make repository menu divide header and content

Browse source 
This is more inline with way GitHub looks like and feels much more natural and
in style with rest of the interface.
This commit is contained in:
Adam Strzelecki 2015-12-02 22:40:22 +01:00
parent ec98deeb8c
commit 3eae4ecde7
24 changed files with 78 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
public/css/gogs.css
View file

@ -1815,6 +1815,17 @@ footer .container .links > *:first-child {
margin: 1px; margin: 1px;
padding-right: 0; padding-right: 0;
} }
.repository .ui.tabs.container {
margin-top: 14px;
margin-bottom: 0px;
}
.repository .ui.tabs.container .ui.menu {
border-bottom: none;
}
.repository .ui.tabs.divider {
margin-top: 0;
margin-bottom: 20px;
}
.repository #clone-panel { .repository #clone-panel {
margin-top: -8px; margin-top: -8px;
width: 100%; width: 100%;

14
public/less/_repository.less
View file

@ -91,6 +91,20 @@
} }
} }
.ui.tabs {
&.container {
margin-top: 14px;
margin-bottom: 0px;
.ui.menu {
border-bottom: none;
}
}
&.divider {
margin-top: 0;
margin-bottom: 20px;
}
}
#clone-panel { #clone-panel {
margin-top: -8px; margin-top: -8px;
width: 100%; width: 100%;

8
templates/repo/commits.tmpl
View file

@ -1,9 +1,9 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository commits"> <div class="repository commits">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/commits_table" .}}
{{template "repo/commits_table" .}} </div>
</div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

2
templates/repo/forks.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository forks"> <div class="repository forks">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<h2 class="ui dividing header"> <h2 class="ui dividing header">
{{.i18n.Tr "repo.forks"}} {{.i18n.Tr "repo.forks"}}
</h2> </h2>

1
templates/repo/header.tmpl
View file

@ -44,5 +44,4 @@
</div><!-- end column --> </div><!-- end column -->
</div><!-- end grid --> </div><!-- end grid -->
</div><!-- end container --> </div><!-- end container -->
<div class="ui divider"></div>
{{end}} {{end}}

2
templates/repo/home.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository file list"> <div class="repository file list">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
<div class="ui ten wide column"> <div class="ui ten wide column">
<p id="repo-desc"> <p id="repo-desc">

2
templates/repo/issue/labels.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository labels"> <div class="repository labels">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="navbar"> <div class="navbar">
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
{{if .IsRepositoryAdmin}} {{if .IsRepositoryAdmin}}

2
templates/repo/issue/list.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository"> <div class="repository">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="navbar"> <div class="navbar">
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
<div class="ui right"> <div class="ui right">

2
templates/repo/issue/milestones.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository milestones"> <div class="repository milestones">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="navbar"> <div class="navbar">
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
{{if .IsRepositoryAdmin}} {{if .IsRepositoryAdmin}}

2
templates/repo/release/list.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository release"> <div class="repository release">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
{{template "base/alert" .}} {{template "base/alert" .}}
<h2 class="ui header"> <h2 class="ui header">
{{.i18n.Tr "repo.release.releases"}} {{.i18n.Tr "repo.release.releases"}}

2
templates/repo/release/new.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository new release"> <div class="repository new release">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<h2 class="ui dividing header"> <h2 class="ui dividing header">
{{if .PageIsEditRelease}} {{if .PageIsEditRelease}}
{{.i18n.Tr "repo.release.edit_release"}} {{.i18n.Tr "repo.release.edit_release"}}

2
templates/repo/settings/collaboration.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings collaboration"> <div class="repository settings collaboration">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">

2
templates/repo/settings/deploy_keys.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings"> <div class="repository settings">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">

2
templates/repo/settings/githook_edit.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings edit githook"> <div class="repository settings edit githook">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">

2
templates/repo/settings/githooks.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings githooks"> <div class="repository settings githooks">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">

2
templates/repo/settings/hook_new.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings new webhook"> <div class="repository settings new webhook">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">

2
templates/repo/settings/hooks.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings webhooks"> <div class="repository settings webhooks">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
{{template "repo/settings/hook_list" .}} {{template "repo/settings/hook_list" .}}

2
templates/repo/settings/options.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository settings options"> <div class="repository settings options">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
{{template "repo/settings/navbar" .}} {{template "repo/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">

53
templates/repo/sidebar.tmpl
View file

@ -1,29 +1,34 @@
{{if not .IsBareRepo}} {{if not .IsBareRepo}}
<div class="ui secondary pointing menu navbar"> <div class="ui tabs container">
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}"> <div class="ui tabular menu navbar">
<i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}} <a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
</a> <i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
<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> </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>
{{end}}
</div> </div>
<div class="ui tabs divider"></div>
{{else}}
<div class="ui divider"></div>
{{end}} {{end}}

2
templates/repo/watchers.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository watchers"> <div class="repository watchers">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<h2 class="ui dividing header"> <h2 class="ui dividing header">
{{if .PageIsWatchers}} {{if .PageIsWatchers}}
{{.i18n.Tr "repo.watchers"}} {{.i18n.Tr "repo.watchers"}}

4
templates/repo/wiki/new.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository wiki new"> <div class="repository wiki new">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
{{template "base/alert" .}} {{template "base/alert" .}}
<div class="ui header"> <div class="ui header">
{{.i18n.Tr "repo.wiki.new_page"}} {{.i18n.Tr "repo.wiki.new_page"}}

2
templates/repo/wiki/pages.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository wiki pages"> <div class="repository wiki pages">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui header"> <div class="ui header">
{{.i18n.Tr "repo.wiki.pages"}} {{.i18n.Tr "repo.wiki.pages"}}
<div class="ui right"> <div class="ui right">

2
templates/repo/wiki/start.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository wiki start"> <div class="repository wiki start">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui center segment"> <div class="ui center segment">
<span class="mega-octicon octicon-book"></span> <span class="mega-octicon octicon-book"></span>
<h2>{{.i18n.Tr "repo.wiki.welcome"}}</h2> <h2>{{.i18n.Tr "repo.wiki.welcome"}}</h2>

2
templates/repo/wiki/view.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="repository wiki view"> <div class="repository wiki view">
{{template "repo/header" .}} {{template "repo/header" .}}
{{template "repo/sidebar" .}}
<div class="ui container"> <div class="ui container">
{{template "repo/sidebar" .}}
<div class="ui grid"> <div class="ui grid">
<div class="ui ten wide column"> <div class="ui ten wide column">
<div class="choose page"> <div class="choose page">