13
3
Fork 0
Wiki Issues 89 resources competences Projects 8 Code Pull Requests Releases Activity
Browse Source

UI: Make repository menu divide header and content 

This is more inline with way GitHub looks like and feels much more natural and
in style with rest of the interface.
tags/v1.0.2
Adam Strzelecki 9 years ago
parent
ec98deeb8c
commit
3eae4ecde7
24 changed files with 78 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      public/css/gogs.css
  2. 14
      public/less/_repository.less
  3. 2
      templates/repo/commits.tmpl
  4. 2
      templates/repo/forks.tmpl
  5. 1
      templates/repo/header.tmpl
  6. 2
      templates/repo/home.tmpl
  7. 2
      templates/repo/issue/labels.tmpl
  8. 2
      templates/repo/issue/list.tmpl
  9. 2
      templates/repo/issue/milestones.tmpl
  10. 2
      templates/repo/release/list.tmpl
  11. 2
      templates/repo/release/new.tmpl
  12. 2
      templates/repo/settings/collaboration.tmpl
  13. 2
      templates/repo/settings/deploy_keys.tmpl
  14. 2
      templates/repo/settings/githook_edit.tmpl
  15. 2
      templates/repo/settings/githooks.tmpl
  16. 2
      templates/repo/settings/hook_new.tmpl
  17. 2
      templates/repo/settings/hooks.tmpl
  18. 2
      templates/repo/settings/options.tmpl
  19. 7
      templates/repo/sidebar.tmpl
  20. 2
      templates/repo/watchers.tmpl
  21. 2
      templates/repo/wiki/new.tmpl
  22. 2
      templates/repo/wiki/pages.tmpl
  23. 2
      templates/repo/wiki/start.tmpl
  24. 2
      templates/repo/wiki/view.tmpl

11
public/css/gogs.css
Unescape 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
Unescape 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%;

2
templates/repo/commits.tmpl
Unescape View File

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

2
templates/repo/forks.tmpl
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<div class="navbar"> <div class="navbar">
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
{{if .IsRepositoryAdmin}} {{if .IsRepositoryAdmin}}

2
templates/repo/issue/list.tmpl
Unescape View File

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

2
templates/repo/release/list.tmpl
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
{{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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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">

7
templates/repo/sidebar.tmpl
Unescape View File

@ -1,5 +1,6 @@
{{if not .IsBareRepo}} {{if not .IsBareRepo}}
<div class="ui secondary pointing menu navbar"> <div class="ui tabs container">
<div class="ui tabular menu navbar">
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}"> <a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
<i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}} <i class="icon octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
</a> </a>
@ -25,5 +26,9 @@
</a> </a>
</div> </div>
{{end}} {{end}}
</div>
</div> </div>
<div class="ui tabs divider"></div>
{{else}}
<div class="ui divider"></div>
{{end}} {{end}}

2
templates/repo/watchers.tmpl
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<h2 class="ui dividing header"> <h2 class="ui dividing header">
{{if .PageIsWatchers}} {{if .PageIsWatchers}}
{{.i18n.Tr "repo.watchers"}} {{.i18n.Tr "repo.watchers"}}

2
templates/repo/wiki/new.tmpl
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
{{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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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
Unescape 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" .}}
<div class="ui container">
{{template "repo/sidebar" .}} {{template "repo/sidebar" .}}
<div class="ui container">
<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">

Write Preview
Loading…
Cancel
Save