diff options
24 files changed, 78 insertions, 49 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css index cd27a674ae..eba8454a1c 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1815,6 +1815,17 @@ footer .container .links > *:first-child { margin: 1px; 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 { margin-top: -8px; width: 100%; diff --git a/public/less/_repository.less b/public/less/_repository.less index ffd432db2d..7f66948c42 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -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 { margin-top: -8px; width: 100%; diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 769841deea..03a07935c8 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}} <div class="repository commits"> - {{template "repo/header" .}} + {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} - {{template "repo/commits_table" .}} - </div> + {{template "repo/commits_table" .}} + </div> </div> {{template "base/footer" .}} diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index e3fd90c671..f541cd0a84 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository forks"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <h2 class="ui dividing header"> {{.i18n.Tr "repo.forks"}} </h2> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 06bd49b9cd..10455db516 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -44,5 +44,4 @@ </div><!-- end column --> </div><!-- end grid --> </div><!-- end container --> -<div class="ui divider"></div> {{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 260f637532..61387f8e13 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository file list"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> <div class="ui ten wide column"> <p id="repo-desc"> diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index f622d1a23b..f955973c6d 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository labels"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="navbar"> {{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 479de75bc1..b927d80063 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="navbar"> {{template "repo/issue/navbar" .}} <div class="ui right"> diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 7a62606514..527a90b4d4 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository milestones"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="navbar"> {{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index b8a8dff2f2..5c3aaae7ff 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository release"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} {{template "base/alert" .}} <h2 class="ui header"> {{.i18n.Tr "repo.release.releases"}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index b966eb6c0b..fcf030314a 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository new release"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <h2 class="ui dividing header"> {{if .PageIsEditRelease}} {{.i18n.Tr "repo.release.edit_release"}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 26009edb69..0fdd397038 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository settings collaboration"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> {{template "repo/settings/navbar" .}} <div class="twelve wide column content"> diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 9b37f48893..e0391b0598 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository settings"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> {{template "repo/settings/navbar" .}} <div class="twelve wide column content"> diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl index 2f79481a2a..f5e80616c1 100644 --- a/templates/repo/settings/githook_edit.tmpl +++ b/templates/repo/settings/githook_edit.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository settings edit githook"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> {{template "repo/settings/navbar" .}} <div class="twelve wide column content"> diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index 980b98fde9..910d750559 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository settings githooks"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> {{template "repo/settings/navbar" .}} <div class="twelve wide column content"> diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl index ac69b02f35..1e0fdd22be 100644 --- a/templates/repo/settings/hook_new.tmpl +++ b/templates/repo/settings/hook_new.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository settings new webhook"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> {{template "repo/settings/navbar" .}} <div class="twelve wide column content"> diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl index 187bd56360..eea165fa8b 100644 --- a/templates/repo/settings/hooks.tmpl +++ b/templates/repo/settings/hooks.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository settings webhooks"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> {{template "repo/settings/navbar" .}} {{template "repo/settings/hook_list" .}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index e109ec11c6..b14b223319 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository settings options"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> {{template "repo/settings/navbar" .}} <div class="twelve wide column content"> diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index 4d68600172..e00fa3bcfd 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -1,29 +1,34 @@ {{if not .IsBareRepo}} -<div class="ui secondary pointing 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"}} +<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> - {{end}} </div> +<div class="ui tabs divider"></div> +{{else}} +<div class="ui divider"></div> {{end}}
\ No newline at end of file diff --git a/templates/repo/watchers.tmpl b/templates/repo/watchers.tmpl index bfac88bb25..0ad6f58bf3 100644 --- a/templates/repo/watchers.tmpl +++ b/templates/repo/watchers.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository watchers"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <h2 class="ui dividing header"> {{if .PageIsWatchers}} {{.i18n.Tr "repo.watchers"}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 6a2ce43a58..be7a357fe1 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository wiki new"> - {{template "repo/header" .}} + {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} {{template "base/alert" .}} <div class="ui header"> {{.i18n.Tr "repo.wiki.new_page"}} diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index f99f6a4ecf..f8bff23221 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository wiki pages"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui header"> {{.i18n.Tr "repo.wiki.pages"}} <div class="ui right"> diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl index 757ab9bce0..641822ddf3 100644 --- a/templates/repo/wiki/start.tmpl +++ b/templates/repo/wiki/start.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository wiki start"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui center segment"> <span class="mega-octicon octicon-book"></span> <h2>{{.i18n.Tr "repo.wiki.welcome"}}</h2> diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index fe8b5b3b36..bfd0a8b601 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div class="repository wiki view"> {{template "repo/header" .}} + {{template "repo/sidebar" .}} <div class="ui container"> - {{template "repo/sidebar" .}} <div class="ui grid"> <div class="ui ten wide column"> <div class="choose page"> |