From a5684b168618b63b1138e73539500cd912fc383b Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 24 Apr 2014 13:36:42 +0200
Subject: [PATCH] Imroved usage of bootstrap.

---
 app/assets/javascripts/app/views/navigation.jst.eco | 8 ++++----
 app/assets/stylesheets/zzz.css                      | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco
index b1a76dd4b..15a100bce 100644
--- a/app/assets/javascripts/app/views/navigation.jst.eco
+++ b/app/assets/javascripts/app/views/navigation.jst.eco
@@ -13,7 +13,7 @@
           <% if item.navheader: %>
             <li class="dropdown-header"><%- @T( item.navheader ) %></li>
           <% end %>
-          <li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count pull-right"><%= item['count'] %></span><% end %></a></li>
+          <li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count"><%= item['count'] %></span><% end %></a></li>
         <% end %>
       </ul>
     </li>
@@ -25,7 +25,7 @@
   </ul>
   <div class="spinner"/>
 <% if !_.isEmpty(@user): %>
-  <ul class="nav navbar-nav pull-right">
+  <ul class="nav navbar-nav navbar-right">
 
     <li class="dropdown">
       <form class="navbar-form">
@@ -48,7 +48,7 @@
               <% if item.navheader: %>
                 <li class="dropdown-header"><%- @T( item.navheader ) %></li>
               <% end %>
-              <li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count pull-right"><%= item['count'] %>)</span><% end %></a></li>
+              <li class="<% if @active_tab[item.target] : %>active<% end %>"><a href="<%= item.target %>"><%- @T( item.name ) %><% if item['count'] isnt undefined: %><span class="badge count"><%= item['count'] %>)</span><% end %></a></li>
             <% end %>
           </ul>
         </li>
@@ -59,7 +59,7 @@
   </ul>
 <% else: %>
   <!--
-  <ul class="nav navbar-nav pull-right">
+  <ul class="nav navbar-nav navbar-right">
     <li><a href="#login"><%- @T( 'Sign in' ) %></a></li>
   </ul>
   -->
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css
index 00d21f00c..0589c89ca 100644
--- a/app/assets/stylesheets/zzz.css
+++ b/app/assets/stylesheets/zzz.css
@@ -896,6 +896,10 @@ footer {
   color: #fff;
 }
 
+.nav.navbar-nav.navbar-right {
+  padding-right: 15px;
+}
+
 .nav.nav-tabs.nav-stacked > li > a > span {
   visibility: hidden;
 }