From: Eden Halperin <eden.halperin@gmail.com>
Date: Wed, 6 Nov 2013 18:17:36 +0000 (-0500)
Subject: user menu fix
X-Git-Tag: live~4625^2~182
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/89a132d31c8ca3b446c716860e55bf31bc811bd0?ds=sidebyside

user menu fix
---

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index ea236a569..3f71932fb 100644
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -6,7 +6,7 @@ L.OSM.key = function (options) {
       .attr('class', 'control-key');
 
     var button = $('<a>')
-      .attr('class', 'control-button')
+      .attr('class', 'control-button mobile-hide')
       .attr('href', '#')
       .html('<span class="icon key"></span>')
       .on('click', toggle)
diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index fd493ee32..ba1461b20 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -8,7 +8,7 @@ L.OSM.layers = function(options) {
       .attr('class', 'control-layers');
 
     var button = $('<a>')
-      .attr('class', 'control-button')
+      .attr('class', 'control-button mobile-hide')
       .attr('href', '#')
       .attr('title', I18n.t('javascripts.map.layers.title'))
       .html('<span class="icon layers"></span>')
diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 6a4491c2a..6701e0bbd 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -11,7 +11,7 @@ L.OSM.share = function (options) {
       .attr('class', 'control-share');
 
     var button = $('<a>')
-      .attr('class', 'control-button')
+      .attr('class', 'control-button mobile-hide')
       .attr('href', '#')
       .attr('title', I18n.t('javascripts.share.title'))
       .html('<span class="icon share"></span>')
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index ca65a1b3d..19cb873df 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -238,7 +238,7 @@ table {
 /* Rules for the header */
 
 #menu-icon { 
-  display: none;
+  display: none !important;
   float: right;
   background: url("/assets/menu-icon.png") no-repeat;
   background-size: 30px 30px;
@@ -252,7 +252,6 @@ table {
 header {
   height: $headerHeight;
   position: relative;
-  // border-bottom: $keyline;
   z-index: 1001;
   font-size: 13px;
 
@@ -357,14 +356,16 @@ nav.secondary {
   position: absolute;
   right: 0;
 
-  > ul a,
-  .dropdown-toggle {
-    display: inline-block;
-    text-decoration: none;
-    color: $darkgrey;
-    padding: 5px;
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;
 
-    &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 10%); }
+    }
   }
 
   > ul li.current a {
@@ -381,6 +382,7 @@ nav.secondary {
 
     > li {
       border-right: $border;
+      float: left;
       &:last-child { 
         border-right: 0;
 
diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index a92bf4ac5..de1b44bb5 100644
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -11,7 +11,7 @@
 /* Rules for the whole left sidebar, including the logo */
 
 #menu-icon {
-  display: inline-block;
+  display: inline-block !important;
 }
 
 
@@ -87,13 +87,13 @@ nav.secondary {
     width: 100%;
     position: fixed;
     top: 58px;
-    height: 360px;
+    height: 370px;
     overflow-x: hidden;
     z-index: 1;
     background: #fff;
     p.large-text {
-      font-size: 1.4em;
-      line-height: 1.5em;
+      font-size: 1.2em;
+      line-height: 1.4em;
     }
     &.minimized {
       background: none;
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 316349664..ab60af2fa 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -71,7 +71,7 @@
         </ul>
       </div>
     <% else %>
-      <ul class="user-menu">
+      <ul class="user-menu clearfix">
         <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath) %></li>
         <li><%= link_to t('layouts.sign_up'), user_new_path %></li>
       </ul>