From 03d79983ee40a22039b5fd1a204499977ab87254 Mon Sep 17 00:00:00 2001
From: Patrick G <geek1011@users.noreply.github.com>
Date: Wed, 15 Mar 2017 18:55:12 +0000
Subject: [PATCH] Cleaner UI for explore page (#1253) (#1255)

* Take navbar out of column
* Add styles to navbar
* Changed navbar classes
* Remove unneeded !important from index.css
* Remove unneeded !important from _explore.less
---
 public/css/index.css                 |  8 +++++
 public/less/_explore.less            |  9 ++++-
 templates/explore/navbar.tmpl        | 23 ++++++------
 templates/explore/organizations.tmpl | 52 +++++++++++++---------------
 templates/explore/repos.tmpl         | 12 +++----
 templates/explore/users.tmpl         | 52 +++++++++++++---------------
 6 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/public/css/index.css b/public/css/index.css
index e840659a2..e0b22687a 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -2944,6 +2944,14 @@ footer .ui.language .menu {
   padding-top: 15px;
   padding-bottom: 80px;
 }
+.explore .navbar {
+  justify-content: center;
+  padding-top: 15px !important;
+  margin-top: -15px !important;
+  margin-bottom: 15px !important;
+  background-color: #FAFAFA !important;
+  border-width: 1px !important;
+}
 .explore .navbar .octicon {
   width: 16px;
   text-align: center;
diff --git a/public/less/_explore.less b/public/less/_explore.less
index 41426e45b..d44d6377f 100644
--- a/public/less/_explore.less
+++ b/public/less/_explore.less
@@ -3,6 +3,13 @@
 	padding-bottom: @footer-margin * 2;
 
 	.navbar {
+        justify-content: center;
+        padding-top: 15px !important;
+        margin-top: -15px !important;
+        margin-bottom: 15px !important;
+        background-color: #FAFAFA !important;
+        border-width: 1px !important;
+        
 		.octicon {
 			width: 16px;
 			text-align: center;
@@ -72,4 +79,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl
index 2e20da0fa..5977e950d 100644
--- a/templates/explore/navbar.tmpl
+++ b/templates/explore/navbar.tmpl
@@ -1,14 +1,11 @@
-<div class="four wide column">
-	<div class="ui vertical menu navbar">
-		<div class="header item">{{.i18n.Tr "explore"}}</div>
-		<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
-			<span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}}
-		</a>
-		<a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users">
-			<span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}}
-		</a>
-		<a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations">
-			<span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}}
-		</a>
-	</div>
+<div class="ui secondary pointing tabular top attached borderless menu navbar">
+	<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
+		<span class="octicon octicon-repo"></span> {{.i18n.Tr "explore.repos"}}
+	</a>
+	<a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users">
+		<span class="octicon octicon-person"></span> {{.i18n.Tr "explore.users"}}
+	</a>
+	<a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations">
+		<span class="octicon octicon-organization"></span> {{.i18n.Tr "explore.organizations"}}
+	</a>
 </div>
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index 7044894a0..4b1ab1834 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -1,37 +1,33 @@
 {{template "base/head" .}}
 <div class="explore users">
+	{{template "explore/navbar" .}}
 	<div class="ui container">
-		<div class="ui grid">
-			{{template "explore/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "explore/search" .}}
+		{{template "explore/search" .}}
 
-				<div class="ui user list">
-					{{range .Users}}
-						<div class="item">
-						  <img class="ui avatar image" src="{{.RelAvatarLink}}">
-						  <div class="content">
-						  	<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
-						    <div class="description">
-									{{if .Location}}
-										<i class="octicon octicon-location"></i> {{.Location}}
-									{{end}}
-									{{if and .Website}}
-										<i class="octicon octicon-link"></i>
-										<a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
-									{{end}}
-									<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
-						    </div>
-						  </div>
-						</div>
-					{{else}}
-						<div>{{$.i18n.Tr "explore.org_no_results"}}</div>
-					{{end}}
+		<div class="ui user list">
+			{{range .Users}}
+				<div class="item">
+				  <img class="ui avatar image" src="{{.RelAvatarLink}}">
+				  <div class="content">
+					<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
+					<div class="description">
+							{{if .Location}}
+								<i class="octicon octicon-location"></i> {{.Location}}
+							{{end}}
+							{{if and .Website}}
+								<i class="octicon octicon-link"></i>
+								<a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
+							{{end}}
+							<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
+					</div>
+				  </div>
 				</div>
-
-				{{template "base/paginate" .}}
-			</div>
+			{{else}}
+				<div>{{$.i18n.Tr "explore.org_no_results"}}</div>
+			{{end}}
 		</div>
+
+		{{template "base/paginate" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
index eac3f1d26..9ca987910 100644
--- a/templates/explore/repos.tmpl
+++ b/templates/explore/repos.tmpl
@@ -1,14 +1,10 @@
 {{template "base/head" .}}
 <div class="explore repositories">
+	{{template "explore/navbar" .}}
 	<div class="ui container">
-		<div class="ui grid">
-			{{template "explore/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "explore/search" .}}
-				{{template "explore/repo_list" .}}
-				{{template "base/paginate" .}}
-			</div>
-		</div>
+		{{template "explore/search" .}}
+		{{template "explore/repo_list" .}}
+		{{template "base/paginate" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index 1fbe8653b..0bbbec2ed 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -1,37 +1,33 @@
 {{template "base/head" .}}
 <div class="explore users">
+	{{template "explore/navbar" .}}
 	<div class="ui container">
-		<div class="ui grid">
-			{{template "explore/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "explore/search" .}}
+		{{template "explore/search" .}}
 
-				<div class="ui user list">
-					{{range .Users}}
-						<div class="item">
-						  <img class="ui avatar image" src="{{.RelAvatarLink}}">
-						  <div class="content">
-						  	<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
-						    <div class="description">
-									{{if .Location}}
-										<i class="octicon octicon-location"></i> {{.Location}}
-									{{end}}
-									{{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}}
-										<i class="octicon octicon-mail"></i>
-										<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
-									{{end}}
-									<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
-						    </div>
-						  </div>
-						</div>
-					{{else}}
-						<div>{{$.i18n.Tr "explore.user_no_results"}}</div>
-					{{end}}
+		<div class="ui user list">
+			{{range .Users}}
+				<div class="item">
+				  <img class="ui avatar image" src="{{.RelAvatarLink}}">
+				  <div class="content">
+					<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
+					<div class="description">
+							{{if .Location}}
+								<i class="octicon octicon-location"></i> {{.Location}}
+							{{end}}
+							{{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}}
+								<i class="octicon octicon-mail"></i>
+								<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
+							{{end}}
+							<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
+					</div>
+				  </div>
 				</div>
-
-				{{template "base/paginate" .}}
-			</div>
+			{{else}}
+				<div>{{$.i18n.Tr "explore.user_no_results"}}</div>
+			{{end}}
 		</div>
+
+		{{template "base/paginate" .}}
 	</div>
 </div>
 {{template "base/footer" .}}