From 1a41e6051560887fd635c9c38d0092f028df9168 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Tue, 16 Sep 2014 18:51:36 +0200
Subject: [PATCH] Improved stylesheet

---
 public_html/css/core.css                 |  6 ++---
 public_html/css/pager.css                |  2 +-
 public_html/css/post-upload.css          |  2 +-
 public_html/css/top-navigation.css       | 16 +++++++++----
 public_html/css/user-list.css            |  2 +-
 public_html/css/user.css                 |  2 +-
 public_html/templates/top-navigation.tpl | 29 +++++++++++++-----------
 7 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/public_html/css/core.css b/public_html/css/core.css
index 9338e46b..378f8567 100644
--- a/public_html/css/core.css
+++ b/public_html/css/core.css
@@ -3,7 +3,7 @@ body {
 	padding: 0;
 	text-align: center;
 	background: #fff;
-	color: #000;
+	color: #555;
 	font-family: 'Droid Sans', sans-serif;
 	font-size: 17px;
 }
@@ -25,12 +25,12 @@ h2 {
 }
 
 a {
-	color: #6a2;
+	color: #298;
 	text-decoration: none;
 }
 
 a:hover {
-	color: #7b3;
+	color: #4ba;
 }
 
 hr {
diff --git a/public_html/css/pager.css b/public_html/css/pager.css
index e1e3177b..687e97b0 100644
--- a/public_html/css/pager.css
+++ b/public_html/css/pager.css
@@ -23,5 +23,5 @@
 	background: #efa;
 }
 .pager li.active a {
-	background: #faffca;
+	background: #f7fbfc;
 }
diff --git a/public_html/css/post-upload.css b/public_html/css/post-upload.css
index 01001710..99b0b26b 100644
--- a/public_html/css/post-upload.css
+++ b/public_html/css/post-upload.css
@@ -57,7 +57,7 @@
 	font-weight: normal;
 }
 #post-upload-step2 table tr.selected {
-	background: #faffca;
+	background: #f7fbfc;
 }
 #post-upload-step2 table .checkbox {
 	width: 30px;
diff --git a/public_html/css/top-navigation.css b/public_html/css/top-navigation.css
index 72fae24e..dafd6b57 100644
--- a/public_html/css/top-navigation.css
+++ b/public_html/css/top-navigation.css
@@ -14,20 +14,23 @@
 
 #top-navigation li a {
 	display: inline-block;
+	text-transform: lowercase;
 	font-variant: small-caps;
 	padding: 0.5em 1em;
-	color: #000;
+	color: #aaa;
+	font-size: 15px;
 }
 
 #top-navigation li.active a {
-	background: #faffca;
+	color: #8ba;
+	background: #f7fbfc;
 }
 
 #top-navigation li a:focus,
 #top-navigation li a:hover {
 	outline: 0;
-	background: #efa;
-	color: #000;
+	background: #f3f7f8;
+	color: #7a9;
 }
 
 #top-navigation li:first-child a {
@@ -37,3 +40,8 @@
 #top-navigation li:last-child a {
 	margin-right: -1em;
 }
+
+#top-navigation i {
+	font-size: 40px;
+	margin: 0 10px 5px;
+}
diff --git a/public_html/css/user-list.css b/public_html/css/user-list.css
index 4c1552f1..6a60fe0f 100644
--- a/public_html/css/user-list.css
+++ b/public_html/css/user-list.css
@@ -18,7 +18,7 @@
 }
 
 #user-list ul.order li.active a {
-	background: #faffca;
+	background: #f7fbfc;
 }
 
 #user-list ul.order a {
diff --git a/public_html/css/user.css b/public_html/css/user.css
index ab4bce7e..022a3a91 100644
--- a/public_html/css/user.css
+++ b/public_html/css/user.css
@@ -29,7 +29,7 @@
 }
 
 #user-view ul a.active {
-	background: #faffca;
+	background: #f7fbfc;
 }
 
 #user-view .tab {
diff --git a/public_html/templates/top-navigation.tpl b/public_html/templates/top-navigation.tpl
index 57bbad2c..34258010 100644
--- a/public_html/templates/top-navigation.tpl
+++ b/public_html/templates/top-navigation.tpl
@@ -1,33 +1,36 @@
 <ul>
 	<%
-		var links = [['home', '#/home', 'Home']];
+		var links = [['home', '#/home', 'Home', 'fa-home']];
 		if (canListPosts) {
-			links.push(['posts', '#/posts', 'Posts']);
+			links.push(['posts', '#/posts', 'Posts', 'fa-th']);
 			if (canUploadPosts) {
-				links.push(['upload', '#/upload', 'Upload']);
+				links.push(['upload', '#/upload', 'Upload', 'fa-upload']);
 			}
-			links.push(['comments', '#/comments', 'Comments']);
+			links.push(['comments', '#/comments', 'Comments', 'fa-comments']);
 		}
 		if (canListTags) {
-			links.push(['tags', '#/tags', 'Tags']);
+			links.push(['tags', '#/tags', 'Tags', 'fa-tags']);
 		}
 		if (canListUsers) {
-			links.push(['users', '#/users', 'Users']);
+			links.push(['users', '#/users', 'Users', 'fa-users']);
 		}
 		if (!loggedIn) {
-			links.push(['login', '#/login', 'Login']);
-			links.push(['register', '#/register', 'Register']);
+			links.push(['login', '#/login', 'Login', 'fa-sign-in']);
+			links.push(['register', '#/register', 'Register', 'fa-file-text-o']);
 		} else {
-			links.push(['my-account', '#/user/' + user.name, user.name]);
-			links.push(['logout', '#/logout', 'Logout']);
+			links.push(['my-account', '#/user/' + user.name, 'Account', 'fa-user']);
+			links.push(['logout', '#/logout', 'Logout', 'fa-sign-out']);
 		}
-		links.push(['help', '#/help', 'Help']);
+		links.push(['help', '#/help', 'Help', 'fa-question-circle']);
 	%>
 
 	<% _.each(links, function(link) { %><!--
-		--><% var className = link[0], target=link[1], title=link[2] %><!--
+		--><% var className = link[0], target=link[1], title=link[2], iconClassName=link[3] %><!--
 		--><li class="<%= className %>">
-			<a href="<%= target %>"><%= title %></a>
+			<a href="<%= target %>">
+				<i class="fa <%= iconClassName %>"></i><br/>
+				<%= title %>
+			</a>
 		</li><!--
 	--><% }) %>
 </ul>