Refine user menu CSS

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 6bdec29889bdfdb8f72f338341086cb98e3af413..dc8c12b707e296b920a9b18131da445918087c26 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -392,11 +392,17 @@ nav.secondary {
   position: absolute;
   right: 0;
 
-  > ul a {
+  > ul {
+    margin-right: 10px;
+  }
+
+  > ul a,
+  .dropdown-toggle {
+    display: inline-block;
     font-weight: bold;
     text-decoration: none;
     color: $darkgrey;
-    padding-right: 10px;
+    padding: 5px 5px;
   }
 
   .dropdown {
@@ -404,27 +410,26 @@ nav.secondary {
     border-radius: 4px;
   }
 
-  img {
+  .caret {
+    border-top-color: $grey;
+    margin-top: 10px;
+    margin-right: 5px;
+  }
+
+  img.user_thumbnail_tiny {
+    border: 0;
     vertical-align: top;
+    margin: 2px 0 0 3px;
     border-radius: 2px 0 0 2px;
-    margin-right: 5px;
   }
 
   #inboxanchor {
     display: inline-block;
-    position: relative;
+    vertical-align: top;
     height: 20px;
-    top: -2px;
-    margin: 0 2px 0 0;
-    padding: 0 5px 0 0;
-    border-radius: 2px;
-  }
-
-  .dropdown-toggle {
-    display: block;
-    padding: 3px 7px;
-    color: #000;
-    text-decoration: none;
+    margin: 2px 7px 0 0;
+    background-color: $grey;
+    border-radius: 0 2px 2px 0;
   }
 
   .dropdown-menu {
@@ -713,7 +718,7 @@ nav.secondary {
 }
 
 .leaflet-top.leaflet-right {
-  top: 10px !important;
+  top: $lineheight !important;
   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;

diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb
index d4054dfaf04913736938c2ae0d7d18780c3f0e46..fbebe3fc19fc5a0f285022ef000637a574a4d573 100644 (file)
--- a/app/views/layouts/_inbox.html.erb
+++ b/app/views/layouts/_inbox.html.erb
@@ -1,3 +1 @@
-<span id="inboxanchor" class="count-number">
-  <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20) %><span><%= @user.new_messages.size %></span>
-</span>
\ No newline at end of file
+<span id="inboxanchor" class="count-number"><%= @user.new_messages.size %></span>
\ No newline at end of file

diff --git a/app/views/layouts/_user_menu.html.erb b/app/views/layouts/_user_menu.html.erb
index 3b45ade304dacc6478ad7819ac79bda10187ab80..a2b09cc806e46ca9ee45a17ee1e1509b16840fde 100644 (file)
--- a/app/views/layouts/_user_menu.html.erb
+++ b/app/views/layouts/_user_menu.html.erb
@@ -1,7 +1,8 @@
 <div class='dropdown'>
   <a class='dropdown-toggle' data-toggle='dropdown' href="#">
-    <%= render :partial => 'layouts/inbox' %>
-    <%= @user.display_name %>
+    <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20)
+    %><%= render :partial => 'layouts/inbox'
+    %><span class='username'><%= @user.display_name %></span>
     <b class="caret"></b>
   </a>
   <ul class='dropdown-menu'>