From c47866b34a1feb6d88d91005f81ee56ff7c42988 Mon Sep 17 00:00:00 2001 From: chriswatt Date: Sun, 14 Feb 2016 23:09:33 +0000 Subject: [PATCH 1/2] Add grey bg to tabs on repo page --- public/css/gogs.css | 102 +++++++++++++++++++++++- public/less/_base.less | 2 +- public/less/_repository.less | 5 ++ templates/repo/header.tmpl | 146 ++++++++++++++++++----------------- 4 files changed, 181 insertions(+), 74 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index 79c920b76..657de394f 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -6,7 +6,7 @@ } body { font-family: 'Helvetica Neue', Arial, Helvetica, sans-serif, '微软雅黑'; - background-color: #FAFAFA; + background-color: #fff; overflow-y: scroll; } img { @@ -1124,6 +1124,11 @@ footer .container .links > *:first-child { .repository .metas .ui.list a .text:hover { color: #000; } +.repository .header-wrapper { + background-color: #FAFAFA; + margin-top: -15px; + padding-top: 15px; +} .repository .filter.menu .label.color { margin-left: 15px; padding: 0 8px; @@ -1289,6 +1294,30 @@ footer .container .links > *:first-child { .repository.new.issue .comment.form .content { margin-left: 4em; } +.repository.new.issue .comment.form .content:before, +.repository.new.issue .comment.form .content:after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} +.repository.new.issue .comment.form .content:before { + border-right-color: #D4D4D5; + border-width: 9px; + margin-top: -9px; +} +.repository.new.issue .comment.form .content:after { + border-right-color: #f7f7f7; + border-width: 8px; + margin-top: -8px; +} +.repository.new.issue .comment.form .content:after { + border-right-color: #fff; +} .repository.new.issue .comment.form .content .markdown { font-size: 14px; } @@ -1395,7 +1424,7 @@ footer .container .links > *:first-child { .repository.view.issue .comment-list .comment .content .header:before, .repository.view.issue .comment-list .comment .content .header:after { right: 100%; - top: 50%; + top: 20px; border: solid transparent; content: " "; height: 0; @@ -1491,6 +1520,30 @@ footer .container .links > *:first-child { .repository .comment.form .content .field:first-child { clear: none; } +.repository .comment.form .content .form:before, +.repository .comment.form .content .form:after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} +.repository .comment.form .content .form:before { + border-right-color: #D4D4D5; + border-width: 9px; + margin-top: -9px; +} +.repository .comment.form .content .form:after { + border-right-color: #f7f7f7; + border-width: 8px; + margin-top: -8px; +} +.repository .comment.form .content .form:after { + border-right-color: #fff; +} .repository .comment.form .content .tab.segment { border: none; padding: 0; @@ -1580,6 +1633,30 @@ footer .container .links > *:first-child { .repository.compare.pull .choose.branch .octicon { padding-right: 10px; } +.repository.compare.pull .comment.form .content:before, +.repository.compare.pull .comment.form .content:after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} +.repository.compare.pull .comment.form .content:before { + border-right-color: #D4D4D5; + border-width: 9px; + margin-top: -9px; +} +.repository.compare.pull .comment.form .content:after { + border-right-color: #f7f7f7; + border-width: 8px; + margin-top: -8px; +} +.repository.compare.pull .comment.form .content:after { + border-right-color: #fff; +} .repository .filter.dropdown .menu { margin-top: 1px!important; } @@ -2096,6 +2173,27 @@ footer .container .links > *:first-child { width: 15px; height: 15px; } +#avatar-arrow:before, +#avatar-arrow:after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} +#avatar-arrow:before { + border-right-color: #D4D4D5; + border-width: 9px; + margin-top: -9px; +} +#avatar-arrow:after { + border-right-color: #f7f7f7; + border-width: 8px; + margin-top: -8px; +} #transfer-repo-modal .ui.message, #delete-repo-modal .ui.message { width: 100%!important; diff --git a/public/less/_base.less b/public/less/_base.less index 1911d3cbb..36591766b 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -2,7 +2,7 @@ body { font-family: 'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑'; - background-color: #FAFAFA; + background-color: #fff; overflow-y: scroll; } img { diff --git a/public/less/_repository.less b/public/less/_repository.less index 61ee44884..c3cc6d805 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -69,6 +69,11 @@ } } } + .header-wrapper { + background-color: #FAFAFA; + margin-top: -15px; + padding-top: 15px; + } .filter.menu { .label.color { margin-left: 15px; diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index cab0fb53d..78f7c0dc4 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -1,87 +1,91 @@ {{with .Repository}} -
-
-
-
-
- - {{.Owner.Name}} -
/
- {{.Name}} - {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} - {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoLink 1 -1}}
{{end}} -
+
+
+
+
+
+
+ + {{.Owner.Name}} +
/
+ {{.Name}} + {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} + {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoLink 1 -1}}
{{end}} +
-
-
- - {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} - - - {{.NumWatches}} - -
-
- - {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} - - - {{.NumStars}} - -
- {{if .CanBeForked}} +
- - {{$.i18n.Tr "repo.fork"}} + + {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} - - {{.NumForks}} + + {{.NumWatches}}
- {{end}} +
+ + {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} + + + {{.NumStars}} + +
+ {{if .CanBeForked}} +
+ + {{$.i18n.Tr "repo.fork"}} + + + {{.NumForks}} + +
+ {{end}} +
-
-
-
-
+
+
+
+
{{end}} {{if not (or .IsBareRepo .IsDiffCompare)}} -
-
- - {{.i18n.Tr "repo.code"}} - - {{if .Repository.EnableIssues}} - - {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} +
+
+
+ + {{.i18n.Tr "repo.code"}} - {{end}} - {{if .Repository.EnablePulls}} - - {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - - {{end}} - - {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} - - - {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} - - {{if .Repository.EnableWiki}} - - {{.i18n.Tr "repo.wiki"}} - - {{end}} - {{if .IsRepositoryAdmin}} -
- - {{.i18n.Tr "repo.settings"}} + {{if .Repository.EnableIssues}} + + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} -
- {{end}} + {{end}} + {{if .Repository.EnablePulls}} + + {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} + + {{end}} + + {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + + + {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + + {{if .Repository.EnableWiki}} + + {{.i18n.Tr "repo.wiki"}} + + {{end}} + {{if .IsRepositoryAdmin}} +
+ + {{.i18n.Tr "repo.settings"}} + +
+ {{end}} +
{{else}}
-{{end}} +{{end}} \ No newline at end of file From d710b5e7915a93e215b7522e045630ab20369eea Mon Sep 17 00:00:00 2001 From: chriswatt Date: Sun, 14 Feb 2016 23:26:47 +0000 Subject: [PATCH 2/2] Fix when repo is empty --- templates/repo/header.tmpl | 154 ++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 78 deletions(-) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 78f7c0dc4..3002ff4b3 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -1,91 +1,89 @@ +
{{with .Repository}} -
-
-
-
-
-
- - {{.Owner.Name}} -
/
- {{.Name}} - {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} - {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoLink 1 -1}}
{{end}} -
- -
-
- - {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} - - - {{.NumWatches}} - -
-
- - {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} - - - {{.NumStars}} - -
- {{if .CanBeForked}} -
- - {{$.i18n.Tr "repo.fork"}} - - - {{.NumForks}} - -
- {{end}} -
+
+
+
+
+
+ + {{.Owner.Name}} +
/
+ {{.Name}} + {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} + {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoLink 1 -1}}
{{end}}
-
-
-
-
+ +
+
+ + {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} + + + {{.NumWatches}} + +
+
+ + {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} + + + {{.NumStars}} + +
+ {{if .CanBeForked}} +
+ + {{$.i18n.Tr "repo.fork"}} + + + {{.NumForks}} + +
+ {{end}} +
+
+
+
+
{{end}} {{if not (or .IsBareRepo .IsDiffCompare)}} -
-
-
- - {{.i18n.Tr "repo.code"}} +
+
+ + {{.i18n.Tr "repo.code"}} + + {{if .Repository.EnableIssues}} + + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} - {{if .Repository.EnableIssues}} - - {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} - - {{end}} - {{if .Repository.EnablePulls}} - - {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - - {{end}} - - {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + {{end}} + {{if .Repository.EnablePulls}} + + {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - - {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + {{end}} + + {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + + + {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + + {{if .Repository.EnableWiki}} + + {{.i18n.Tr "repo.wiki"}} - {{if .Repository.EnableWiki}} - - {{.i18n.Tr "repo.wiki"}} + {{end}} + {{if .IsRepositoryAdmin}} +
+ + {{.i18n.Tr "repo.settings"}} - {{end}} - {{if .IsRepositoryAdmin}} -
- - {{.i18n.Tr "repo.settings"}} - -
- {{end}} -
+
+ {{end}}
{{else}}
-{{end}} \ No newline at end of file +{{end}} +
\ No newline at end of file