From 545dc9d851993e9c7861cf935e7efcb473fb4536 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 17 May 2013 11:54:59 -0400
Subject: [PATCH] top bar user settings are pulled right

---
 public/css/style.less       | 8 ++++++++
 public/templates/header.tpl | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/css/style.less b/public/css/style.less
index 1d5ce86999..cef80c0496 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -691,4 +691,12 @@ a:hover {
 		text-overflow:ellipsis;
 		overflow: hidden;
 	}
+}
+
+body .navbar .nodebb-inline-block {
+	display:inline-block;
+}
+
+#right-menu{
+	float:right;
 }
\ No newline at end of file
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index cf4984bdbf..93096a053a 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -28,7 +28,7 @@
 					<span class="icon-bar"></span>
 				</button>
 				<div class="nav-collapse collapse">
-					<ul class="nav">
+					<ul class="nav nodebb-inline-block">
 						<li>
 	                      <a href="/latest">Recent <span class="badge badge-inverse">3</span></a>
 	                    </li>
@@ -42,7 +42,7 @@
 	                      <a href="/users">Users</a>
 	                    </li>
 					</ul>
-					<ul class="nav pull-right" id="right-menu">
+					<ul class="nav pull-right nodebb-inline-block nodebb-pull-right" id="right-menu">
 						<!--<li><i class="icon-plus icon-2x" style="color:#999;"></i></li> fail. add this back later -->
 						<!--<li><a href="/users" id="user_label"></a></li>-->
 					</ul>
@@ -79,7 +79,7 @@
 			</div>
 		</div>
 	</div>
-
+    
 	<div id="disconnect-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	  <div class="modal-header">
 	    <h3 id="myModalLabel">Socket Disconnect</h3>