From 4416454941461a44ce7a739d0c51e37a7ca62e07 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 7 Apr 2015 17:50:59 -0400
Subject: [PATCH] closes #58

---
 less/unread.less      |  4 +---
 templates/popular.tpl |  1 -
 templates/recent.tpl  | 20 ++++++++++++--------
 templates/unread.tpl  | 41 ++++++++++++++++++++++-------------------
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/less/unread.less b/less/unread.less
index bbb4776..fe7691b 100644
--- a/less/unread.less
+++ b/less/unread.less
@@ -1,5 +1,3 @@
 .unread {
-	.markread {
-		margin-bottom: 20px;
-	}
+
 }
\ No newline at end of file
diff --git a/templates/popular.tpl b/templates/popular.tpl
index cf7ab66..5898e9f 100644
--- a/templates/popular.tpl
+++ b/templates/popular.tpl
@@ -11,7 +11,6 @@
 	<br />
 
 	<div class="category">
-		<p>[[global:header.popular]]</p>
 		<!-- IF !topics.length -->
 		<div class="alert alert-warning" id="category-no-topics">
 			<strong>[[recent:no_popular_topics]]</strong>
diff --git a/templates/recent.tpl b/templates/recent.tpl
index 721c35b..46ffc86 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -1,17 +1,21 @@
 <div class="recent">
-	<!-- IMPORT partials/breadcrumbs.tpl -->
 
-	<!-- IF loggedIn -->
-	<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
-	<!-- ELSE -->
-	<a href="/login?next=recent" class="btn btn-primary">[[category:guest-login-post]]</a>
-	<!-- ENDIF loggedIn -->
+	<div class="clearfix">
+		<div class="pull-left">
+		<!-- IMPORT partials/breadcrumbs.tpl -->
+		</div>
+		<div class="pull-right">
+			<!-- IF loggedIn -->
+			<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
+			<!-- ELSE -->
+			<a href="/login?next=recent" class="btn btn-primary">[[category:guest-login-post]]</a>
+			<!-- ENDIF loggedIn -->
+		</div>
+	</div>
 
 	<hr />
 
 	<div class="category">
-		<p>[[recent:title]]</p>
-
 		<!-- IF !topics.length -->
 		<div class="alert alert-warning" id="category-no-topics">
 			<strong>[[recent:no_recent_topics]]</strong>
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 372facb..81f701e 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -1,28 +1,31 @@
 <div class="unread">
-	<!-- IMPORT partials/breadcrumbs.tpl -->
 
+	<div class="clearfix">
+		<div class="pull-left">
+		<!-- IMPORT partials/breadcrumbs.tpl -->
+		</div>
 
-
-	<div class="markread btn-group <!-- IF !topics.length -->hidden<!-- ENDIF !topics.length -->">
-		<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-			[[unread:mark_as_read]] <span class="caret"></span>
-		</button>
-		<ul class="dropdown-menu" role="menu">
-
-			<li role="presentation">
-				<a id="markSelectedRead" role="menuitem" tabindex="-1" href="#">[[unread:selected]]</a>
-			</li>
-
-			<li role="presentation">
-				<a id="markAllRead" role="menuitem" tabindex="-1" href="#">[[unread:all]]</a>
-			</li>
-			<li class="divider"></li>
-		</ul>
+		<div class="markread btn-group pull-right<!-- IF !topics.length --> hidden<!-- ENDIF !topics.length -->">
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+				[[unread:mark_as_read]] <span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu" role="menu">
+
+				<li role="presentation">
+					<a id="markSelectedRead" role="menuitem" tabindex="-1" href="#">[[unread:selected]]</a>
+				</li>
+
+				<li role="presentation">
+					<a id="markAllRead" role="menuitem" tabindex="-1" href="#">[[unread:all]]</a>
+				</li>
+				<li class="divider"></li>
+			</ul>
+		</div>
 	</div>
 
-	<div class="category">
-		<p>[[unread:title]]</p>
+	<hr />
 
+	<div class="category">
 		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">
 			<strong>[[unread:no_unread_topics]]</strong>
 		</div>