From 93e5b95455cb4521ac5c50da6e0b16600564ee01 Mon Sep 17 00:00:00 2001
From: Gerben <gerben@treora.com>
Date: Tue, 20 Mar 2018 18:00:15 +0100
Subject: [PATCH] Move repo description to repo header

---
 public/custom-style.css    | 29 +++++++++++++++++++++++++++++
 templates/repo/header.tmpl | 16 ++++++++++------
 templates/repo/home.tmpl   |  6 +-----
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/public/custom-style.css b/public/custom-style.css
index 6a3ce6f..60ed609 100644
--- a/public/custom-style.css
+++ b/public/custom-style.css
@@ -2,3 +2,32 @@
   /* Since we have no footer bar, reduce padding */
   padding-bottom: 15px;
 }
+
+.repository .repo-header {
+  padding: 0.5rem 0;
+}
+.repository .header-grid > * {
+  padding-top: 1rem;
+  padding-bottom: 0.5rem;
+}
+.repository .header-grid {
+  align-items: flex-end;
+  align-items: last baseline;
+}
+
+.repository .mega-octicon {
+  margin-right: 0.5rem;
+}
+.repository .header-grid .fork-flag {
+  margin-left: 0;
+}
+
+/* These rules are copied here to pull them out of their nesting. */
+.repo-description {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+#repo-desc {
+    font-size: 1.2em;
+}
\ No newline at end of file
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 8a037a1..6f872b5 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -1,17 +1,21 @@
 <div class="header-wrapper">
 {{with .Repository}}
-	<div class="ui container">
+	<div class="ui container repo-header">
 		<div class="ui stackable grid header-grid">
-			<div class="eight wide column">
+				<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
 				<div class="ui huge breadcrumb">
-					<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
+					{{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener" href="{{$.Mirror.Address}}">{{$.Mirror.Address}}</a></div>{{end}}
+					{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{SubStr .BaseRepo.RelLink 1 -1}}</a></div>{{end}}
 					<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
 					<div class="divider"> / </div>
 					<a href="{{$.RepoLink}}">{{.Name}}</a>
-					{{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener" href="{{$.Mirror.Address}}">{{$.Mirror.Address}}</a></div>{{end}}
-					{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{SubStr .BaseRepo.RelLink 1 -1}}</a></div>{{end}}
 				</div>
-			</div>
+				<div class="ui repo-description">
+					<div id="repo-desc">
+						{{if .DescriptionHTML}}<span class="description has-emoji">{{.DescriptionHTML}}</span>{{end}}
+						<a class="link" href="{{.Website}}">{{.Website}}</a>
+					</div>
+				</div>
 		</div><!-- end grid -->
 	</div><!-- end container -->
 {{end}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 91db56c..f13b365 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -3,11 +3,7 @@
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		<div class="ui repo-description">
-			<div id="repo-desc">
-				{{if .Repository.DescriptionHTML}}<span class="description has-emoji">{{.Repository.DescriptionHTML}}</span>{{else if .IsRepositoryAdmin}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
-				<a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
-			</div>
+		<div>
 			{{if .RepoSearchEnabled}}
 				<div class="ui repo-search">
 					<form class="ui form" action="{{.RepoLink}}/search" method="get">