From 22b0dfbb35f10f22ef0485e289f44532d7a71863 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Mon, 30 Nov 2015 15:38:58 +0100 Subject: [PATCH 1/9] CSS: Ensure Octicons are used with 16px font size Semantic UI .icon 1em font-size has priority over .octicon 16px, resulting octicons rendered at 14px font-size, which is not okay since Octicons are meant to be shown sizes that are multiples of 16px. --- public/css/gogs.css | 4 +++- public/less/_octicons.less | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index d58c4e2540f..19a34b8fe2e 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -5,7 +5,9 @@ font-style: normal; } .octicon, -.mega-octicon { +.mega-octicon, +.icon.octicon, +.icon.mega-octicon { font: normal normal normal 16px/1 octicons; display: inline-block; text-decoration: none; diff --git a/public/less/_octicons.less b/public/less/_octicons.less index dfd437e6b17..a159dec851e 100755 --- a/public/less/_octicons.less +++ b/public/less/_octicons.less @@ -14,7 +14,9 @@ // .octicon is optimized for 16px. // .mega-octicon is optimized for 32px but can be used larger. -.octicon, .mega-octicon { +.octicon, .mega-octicon, +// ensure Semantic UI .icon of 14px does not apply to .icon.octicon: +.icon.octicon, .icon.mega-octicon { font: normal normal normal 16px/1 octicons; display: inline-block; text-decoration: none; From 99b958db4325fd52566dd0d0e81afb8d891bac27 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Mon, 30 Nov 2015 15:22:24 +0100 Subject: [PATCH 2/9] UI: Mark top menu icons blue only when non-zero --- templates/repo/sidebar.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index 912b50570b3..4c0ab588c64 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -4,16 +4,16 @@ {{.i18n.Tr "repo.code"}} - {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} - {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} + {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} - {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} {{.i18n.Tr "repo.wiki"}} From 640dce12a892eaf1fa21399f5cac12e8ea83bd9e Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Mon, 30 Nov 2015 23:57:07 +0100 Subject: [PATCH 3/9] CSS: .repository .sha.label -> .ui .sha.label This is because SHA1 label is used in many other places, not only inside .repository container. --- public/css/gogs.css | 13 +++++++------ public/less/_base.less | 8 ++++++++ public/less/_repository.less | 6 ------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index 19a34b8fe2e..d3565b192bd 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -913,6 +913,13 @@ pre.raw { .ui .form .fake { display: none !important; } +.ui .sha.label { + font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; + font-size: 14px; + padding: 6px 10px 4px 10px; + font-weight: normal; + margin: 0 6px; +} .ui.status.buttons .octicon { margin-right: 4px; } @@ -2267,12 +2274,6 @@ footer .container .links > *:first-child { .repository .commits.table .date { width: 120px; } -.repository .sha.label { - font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; - font-size: 14px; - padding: 6px 10px 4px 10px; - font-weight: normal; -} .repository .diff-detail-box { margin: 15px 0; line-height: 30px; diff --git a/public/less/_base.less b/public/less/_base.less index 086c687709d..2ae2fea6e76 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -219,6 +219,14 @@ pre { } } + .sha.label { + font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; + font-size: 14px; + padding: 6px 10px 4px 10px; + font-weight: normal; + margin: 0 6px; + } + &.status.buttons { .octicon { margin-right: 4px; diff --git a/public/less/_repository.less b/public/less/_repository.less index 928d5cf3572..2e0ea17c798 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -630,12 +630,6 @@ width: 120px; } } - .sha.label { - font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; - font-size: 14px; - padding: 6px 10px 4px 10px; - font-weight: normal; - } .diff-detail-box { margin: 15px 0; From 4813665d0ad600729fe0aba3346f026502fe3b14 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Mon, 30 Nov 2015 23:59:23 +0100 Subject: [PATCH 4/9] CSS: Reduce .sha.label font size to 13px --- public/css/gogs.css | 2 +- public/less/_base.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index d3565b192bd..9cf6e39b27e 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -915,7 +915,7 @@ pre.raw { } .ui .sha.label { font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; - font-size: 14px; + font-size: 13px; padding: 6px 10px 4px 10px; font-weight: normal; margin: 0 6px; diff --git a/public/less/_base.less b/public/less/_base.less index 2ae2fea6e76..77ed754518b 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -221,7 +221,7 @@ pre { .sha.label { font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; - font-size: 14px; + font-size: 13px; padding: 6px 10px 4px 10px; font-weight: normal; margin: 0 6px; From 61fdd8c57120e25a31a686ad60f35ac6445786bd Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Tue, 1 Dec 2015 00:04:13 +0100 Subject: [PATCH 5/9] Commits & files UI: SUI fixed single line table Instead using own ellipsis, uses Semantic UI fixed single line table which effectively applies ellipsis to all overflowing table cells. NOTE: File list cannot use colspan="2" for 1st "Last commit" elements, otherwise layout breaks with fixed table. --- public/css/gogs.css | 45 +--------------------------- public/less/_repository.less | 49 +----------------------------- templates/repo/commits_table.tmpl | 17 ++++++----- templates/repo/view_list.tmpl | 50 +++++++++++++------------------ 4 files changed, 32 insertions(+), 129 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index 9cf6e39b27e..cd27a674aed 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1857,40 +1857,16 @@ footer .container .links > *:first-child { .repository.file.list .head.meta li .ui.breadcrumb a { font-size: 16px; } -.repository.file.list #repo-files-table .table.list { - width: 80% !important; -} .repository.file.list #repo-files-table thead th { padding-top: 8px; padding-bottom: 5px; font-weight: normal; } -.repository.file.list #repo-files-table thead th #last-commit-message { - margin-left: 5px; - margin-bottom: -4px; - width: 400px; -} -.repository.file.list #repo-files-table thead th .age { - margin-top: 2px; -} .repository.file.list #repo-files-table thead .ui.avatar { margin-bottom: 5px; } .repository.file.list #repo-files-table tbody .icon { - margin-left: 5px; -} -.repository.file.list #repo-files-table tbody .name { - max-width: 120px; -} -.repository.file.list #repo-files-table tbody .message { - max-width: 300px; -} -.repository.file.list #repo-files-table tbody .age { - min-width: 150px; -} -.repository.file.list #repo-files-table tbody .text.truncate { - margin-bottom: -5px; - max-width: 100%; + margin-right: 5px; } .repository.file.list #repo-files-table td { padding-top: 8px; @@ -2255,25 +2231,6 @@ footer .container .links > *:first-child { font-weight: normal; padding: 5px 10px; } -.repository .commits.table { - font-size: 13px; -} -.repository .commits.table th:first-child, -.repository .commits.table td:first-child { - padding-left: 15px; -} -.repository .commits.table td { - line-height: 15px; -} -.repository .commits.table .author { - min-width: 180px; -} -.repository .commits.table .message span { - max-width: 500px; -} -.repository .commits.table .date { - width: 120px; -} .repository .diff-detail-box { margin: 15px 0; line-height: 30px; diff --git a/public/less/_repository.less b/public/less/_repository.less index 2e0ea17c798..ffd432db2dd 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -143,24 +143,11 @@ } #repo-files-table { - .table.list { - width: 80% !important; - } - thead { th { padding-top: 8px; padding-bottom: 5px; font-weight: normal; - - #last-commit-message { - margin-left: 5px; - margin-bottom: -4px; - width: 400px; - } - .age { - margin-top: 2px; - } } .ui.avatar { margin-bottom: 5px; @@ -168,21 +155,7 @@ } tbody { .icon { - margin-left: 5px; - } - .name { - max-width: 120px; - } - .message { - max-width: 300px; - } - .age { - min-width: 150px; - } - - .text.truncate { - margin-bottom: -5px; - max-width: 100%; + margin-right: 5px; } } td { @@ -610,26 +583,6 @@ } } } - .commits.table { - font-size: 13px; - th, td { - &:first-child { - padding-left: 15px; - } - } - td { - line-height: 15px; - } - .author { - min-width: 180px; - } - .message span { - max-width: 500px; - } - .date { - width: 120px; - } - } .diff-detail-box { margin: 15px 0; diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 58ab1ebb1ed..5e207486ff9 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -16,13 +16,12 @@ {{if .Commits}}
- +
- - - - + + + @@ -36,9 +35,11 @@   {{.Author.Name}} {{end}} - - - + + {{end}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 9edbd687c88..9b6c0aaa197 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -1,28 +1,26 @@ -
{{.i18n.Tr "repo.commits.author"}}SHA1{{.i18n.Tr "repo.commits.message"}}{{.i18n.Tr "repo.commits.date"}}{{.i18n.Tr "repo.commits.author"}}   SHA1    {{.i18n.Tr "repo.commits.message"}}{{.i18n.Tr "repo.commits.date"}}
{{SubStr .ID.String 0 10}} {{RenderCommitMessage .Summary $.RepoLink}}{{TimeSince .Author.When $.Lang}} + {{ShortSha .ID.String}} + {{RenderCommitMessage .Summary $.RepoLink}} + {{TimeSince .Author.When $.Lang}}
+
- + + {{if .HasParentPath}} - - + {{end}} {{range $item := .Files}} @@ -32,27 +30,21 @@ {{if $entry.IsSubModule}} - {{else}} - {{end}} - - From ec98deeb8cc6727a01ac8510805d66acd2c7d152 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Wed, 2 Dec 2015 22:06:50 +0100 Subject: [PATCH 6/9] UI: Keep repository settings menu button right --- templates/repo/sidebar.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index 4c0ab588c64..4d686001727 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -19,9 +19,11 @@ {{.i18n.Tr "repo.wiki"}} {{if .IsRepositoryAdmin}} - - {{.i18n.Tr "repo.settings"}} - +
+ + {{.i18n.Tr "repo.settings"}} + +
{{end}} {{end}} \ No newline at end of file From 3eae4ecde76d3196b8fb5c7d4482c74e438d5a87 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Wed, 2 Dec 2015 22:40:22 +0100 Subject: [PATCH 7/9] 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. --- public/css/gogs.css | 11 +++++ public/less/_repository.less | 14 ++++++ templates/repo/commits.tmpl | 8 ++-- templates/repo/forks.tmpl | 2 +- templates/repo/header.tmpl | 1 - templates/repo/home.tmpl | 2 +- templates/repo/issue/labels.tmpl | 2 +- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/release/list.tmpl | 2 +- templates/repo/release/new.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/repo/settings/githook_edit.tmpl | 2 +- templates/repo/settings/githooks.tmpl | 2 +- templates/repo/settings/hook_new.tmpl | 2 +- templates/repo/settings/hooks.tmpl | 2 +- templates/repo/settings/options.tmpl | 2 +- templates/repo/sidebar.tmpl | 53 ++++++++++++---------- templates/repo/watchers.tmpl | 2 +- templates/repo/wiki/new.tmpl | 4 +- templates/repo/wiki/pages.tmpl | 2 +- templates/repo/wiki/start.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- 24 files changed, 78 insertions(+), 49 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index cd27a674aed..eba8454a1c5 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 ffd432db2dd..7f66948c42e 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 769841deeae..03a07935c80 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}}
- {{template "repo/header" .}} + {{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}} - {{template "repo/commits_table" .}} -
+ {{template "repo/commits_table" .}} +
{{template "base/footer" .}} diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index e3fd90c671f..f541cd0a841 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}

{{.i18n.Tr "repo.forks"}}

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 06bd49b9cd2..10455db5169 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -44,5 +44,4 @@
-
{{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 260f6375322..61387f8e134 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}

diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index f622d1a23b9..f955973c6d4 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}

{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 479de75bc12..b927d800638 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/issue/navbar" .}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 7a62606514d..527a90b4d45 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index b8a8dff2f2a..5c3aaae7ff3 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}} {{template "base/alert" .}}

{{.i18n.Tr "repo.release.releases"}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index b966eb6c0b8..fcf030314ad 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}

{{if .PageIsEditRelease}} {{.i18n.Tr "repo.release.edit_release"}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 26009edb693..0fdd3970387 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/settings/navbar" .}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 9b37f488937..e0391b05984 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/settings/navbar" .}}
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl index 2f79481a2ac..f5e80616c1e 100644 --- a/templates/repo/settings/githook_edit.tmpl +++ b/templates/repo/settings/githook_edit.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/settings/navbar" .}}
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index 980b98fde98..910d7505591 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/settings/navbar" .}}
diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl index ac69b02f35b..1e0fdd22be0 100644 --- a/templates/repo/settings/hook_new.tmpl +++ b/templates/repo/settings/hook_new.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/settings/navbar" .}}
diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl index 187bd563607..eea165fa8ba 100644 --- a/templates/repo/settings/hooks.tmpl +++ b/templates/repo/settings/hooks.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/settings/navbar" .}} {{template "repo/settings/hook_list" .}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index e109ec11c6e..b14b2233194 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{template "repo/settings/navbar" .}}
diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index 4d686001727..e00fa3bcfd0 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -1,29 +1,34 @@ {{if not .IsBareRepo}} -
- - {{.i18n.Tr "repo.code"}} - - - {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} - - - {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - - - {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} - - - {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} - - - {{.i18n.Tr "repo.wiki"}} - - {{if .IsRepositoryAdmin}} -
- - {{.i18n.Tr "repo.settings"}} +
+
+ + {{.i18n.Tr "repo.code"}} + + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} + + + {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} + + + {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + + + {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + + + {{.i18n.Tr "repo.wiki"}} + + {{if .IsRepositoryAdmin}} +
+ + {{.i18n.Tr "repo.settings"}} + +
+ {{end}}
- {{end}}
+
+{{else}} +
{{end}} \ No newline at end of file diff --git a/templates/repo/watchers.tmpl b/templates/repo/watchers.tmpl index bfac88bb250..0ad6f58bf34 100644 --- a/templates/repo/watchers.tmpl +++ b/templates/repo/watchers.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}

{{if .PageIsWatchers}} {{.i18n.Tr "repo.watchers"}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 6a2ce43a588..be7a357fe18 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
- {{template "repo/header" .}} + {{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}} {{template "base/alert" .}}
{{.i18n.Tr "repo.wiki.new_page"}} diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index f99f6a4ecf5..f8bff232214 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
{{.i18n.Tr "repo.wiki.pages"}}
diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl index 757ab9bce0a..641822ddf34 100644 --- a/templates/repo/wiki/start.tmpl +++ b/templates/repo/wiki/start.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}

{{.i18n.Tr "repo.wiki.welcome"}}

diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index fe8b5b3b360..bfd0a8b601d 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/sidebar" .}}
- {{template "repo/sidebar" .}}
From 314664892c42741e2ff905bead8b7e8105aecaca Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Wed, 2 Dec 2015 23:48:36 +0100 Subject: [PATCH 8/9] UI: Keep repo URL action right of ref combo & path Just use secondary menu instead custom ".head.meta", which simplifies code. Also do not display repo URL action when we are in subdirectory or viewing a file. --- public/css/gogs.css | 14 ---- public/less/_repository.less | 16 ---- templates/repo/home.tmpl | 155 +++++++++++++++++------------------ 3 files changed, 75 insertions(+), 110 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index eba8454a1c5..eb6188b37fb 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1854,20 +1854,6 @@ footer .container .links > *:first-child { .repository.file.list .choose.reference .header .icon { font-size: 1.4em; } -.repository.file.list .head.meta { - padding: 0; -} -.repository.file.list .head.meta li { - list-style: none; - display: inline-block; -} -.repository.file.list .head.meta li .ui.breadcrumb { - margin-top: -5px; -} -.repository.file.list .head.meta li .ui.breadcrumb span, -.repository.file.list .head.meta li .ui.breadcrumb a { - font-size: 16px; -} .repository.file.list #repo-files-table thead th { padding-top: 8px; padding-bottom: 5px; diff --git a/public/less/_repository.less b/public/less/_repository.less index 7f66948c42e..25a71078e10 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -139,22 +139,6 @@ font-size: 1.4em; } } - .head.meta { - padding: 0; - li { - list-style: none; - display: inline-block; - - .ui.breadcrumb { - margin-top: -5px; - - span, - a { - font-size: 16px; - } - } - } - } #repo-files-table { thead { diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 61387f8e134..85094104bfc 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -3,14 +3,81 @@ {{template "repo/header" .}} {{template "repo/sidebar" .}}
-
-
-

- {{if .Repository.DescriptionHtml}}{{.Repository.DescriptionHtml}}{{else}}{{.i18n.Tr "repo.no_desc"}}{{end}} - {{.Repository.Website}} -

+

+ {{if .Repository.DescriptionHtml}}{{.Repository.DescriptionHtml}}{{else}}{{.i18n.Tr "repo.no_desc"}}{{end}} + {{.Repository.Website}} +

+
+ {{if and .IsRepositoryAdmin .Repository.BaseRepo}} +
+ {{ $baseRepo := .Repository.BaseRepo}} + + +
-
+ {{end}} +
+
+
+ + + {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: + {{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}} + + +
+
+
+ + +
+
+
+
+ + + {{.i18n.Tr "repo.branches"}} + + + + + {{.i18n.Tr "repo.tags"}} + + +
+
+
+ + +
+
+
+
+
+ {{.Repository.Name}} + {{ $n := len .Treenames}} + {{ $l := Subtract $n 1}} + {{range $i, $v := .Treenames}} +
/
+ {{if eq $i $l}} + {{$v}} + {{else}} + {{ $p := index $.Paths $i}} + {{$v}} + {{end}} + {{end}} +
+
+ {{if eq $n 0}} +
{{if not $.DisableSSH}}
-
- -
    - {{if and .IsRepositoryAdmin .Repository.BaseRepo}} -
  • - {{ $baseRepo := .Repository.BaseRepo}} - - - -
    • {{end}} -
  • -
    -
    -
    - - - {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: - {{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}} - - -
    -
    -
    - - -
    -
    -
    -
    - - - {{.i18n.Tr "repo.branches"}} - - - - - {{.i18n.Tr "repo.tags"}} - - -
    -
    -
    - - -
    -
    -
    -
    • -
  • -
    - {{.Repository.Name}} - {{ $n := len .Treenames}} - {{ $l := Subtract $n 1}} - {{range $i, $v := .Treenames}} -
    /
    - {{if eq $i $l}} - {{$v}} - {{else}} - {{ $p := index $.Paths $i}} - {{$v}} - {{end}} - {{end}} -
    -
    • -
+
{{if .IsFile}} {{template "repo/view_file" .}} {{else}} From b73241ceb175b437c114dae686c9cffb69396e41 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Thu, 3 Dec 2015 01:15:40 +0100 Subject: [PATCH 9/9] UI: Display last-commit header without 2nd column This uses a CSS trick making first th to be relative block with width equal to first two columns, effectively working around inability to use colspan="2" on first row that was breaking "fixed-layout" for tables. Also use grey header for last-commit SHA1 tag. --- public/css/gogs.css | 5 +++++ public/less/_repository.less | 5 +++++ templates/repo/view_list.tmpl | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index eb6188b37fb..c3ac5ffce19 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1859,6 +1859,11 @@ footer .container .links > *:first-child { padding-bottom: 5px; font-weight: normal; } +.repository.file.list #repo-files-table thead th:first-child { + display: block; + position: relative; + width: 325%; +} .repository.file.list #repo-files-table thead .ui.avatar { margin-bottom: 5px; } diff --git a/public/less/_repository.less b/public/less/_repository.less index 25a71078e10..ee17177fc16 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -146,6 +146,11 @@ padding-top: 8px; padding-bottom: 5px; font-weight: normal; + &:first-child { + display: block; + position: relative; + width: 325%; + } } .ui.avatar { margin-bottom: 5px; diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 9b6c0aaa197..4acfa2b676e 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -9,10 +9,10 @@ {{.LastCommit.Author.Name}} {{end}} + {{ShortSha .LastCommit.ID.String}} + {{RenderCommitMessage .LastCommit.Summary .RepoLink}}

- - {{if .LastCommitUser}} - - {{.LastCommit.Author.Name}}: - {{else}} - - {{.LastCommit.Author.Name}}: - {{end}} - - - {{ShortSha .LastCommit.ID.String}} - {{RenderCommitMessage .LastCommit.Summary .RepoLink}} - {{TimeSince .LastCommit.Author.When $.Lang}} + + {{if .LastCommitUser}} + + {{.LastCommit.Author.Name}} + {{else}} + + {{.LastCommit.Author.Name}} + {{end}} + {{ShortSha .LastCommit.ID.String}} + {{RenderCommitMessage .LastCommit.Summary .RepoLink}} + {{TimeSince .LastCommit.Author.When $.Lang}}
....
- {{if $commit.RefUrl}} - {{$entry.Name}} @ {{ShortSha $commit.RefId}} + {{$entry.Name}} @ {{ShortSha $commit.RefId}} {{else}} {{$entry.Name}} @ {{ShortSha $commit.RefId}} {{end}} - - - {{$entry.Name}} + + {{$entry.Name}} - {{SubStr $commit.ID.String 0 10}} - - {{RenderCommitMessage $commit.Summary $.RepoLink}} + + {{ShortSha $commit.ID.String}} + {{RenderCommitMessage $commit.Summary $.RepoLink}} {{TimeSince $commit.Committer.When $.Lang}}
- {{ShortSha .LastCommit.ID.String}} - {{RenderCommitMessage .LastCommit.Summary .RepoLink}} {{TimeSince .LastCommit.Author.When $.Lang}}