Commit 549c94c1

@@ -8,16 +8,6 @@
       </button>
       <%= link_to "Cakeside", root_path, class: 'brand', style: 'color:hotpink;' %>
       <div class="nav-collapse collapse">
-        <p class="navbar-text pull-right">
-        <% if user_signed_in? %>
-          <%= link_to current_user.name, my_root_path, class: 'navbar-link' %>
-          <%= link_to my_root_path, class: 'navbar-link' do %>
-            <%= avatar_for(current_user, size: 24) %>
-          <% end %>
-        <% else %>
-          <%= link_to "Sign In", login_path, class: 'navbar-link' %>
-        <% end %>
-        </p>
         <ul class="nav">
           <li>
             <%= form_tag(search_path, method: :get, name: "search", class: "navbar-search pull-left") do %>
@@ -31,7 +21,7 @@
           <li class="<%= "active" if params["controller"] == "tutorials" %>"> <%= link_to "Tutorials", tutorials_path %> </li>
           <% if user_signed_in? %>
           <li class="dropdown">
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#"> 
+            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
               <i class="icon-plus"></i> <b class="caret"></b>
             </a>
             <ul class="dropdown-menu">
@@ -49,6 +39,18 @@
           </li>
           <% end  %>
         </ul>
+        <ul class="nav pull-right">
+        <% if user_signed_in? %>
+          <li><%= link_to current_user.name, my_root_path %></li>
+          <li>
+            <%= link_to my_root_path do %>
+              <%= avatar_for(current_user, size: 24) %>
+            <% end %>
+          </li>
+        <% else %>
+          <li><%= link_to "Sign In", login_path %></li>
+        <% end %>
+        </ul>
       </div><!--/.nav-collapse -->
     </div>
   </div>