From bcf5f397d72a88a108d48ce390b79428f53952c2 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 16:35:02 +0000
Subject: [PATCH] tweaks to menu on mobile

---
 .../wagtailadmin/css/components/forms.less    |  2 +-
 .../static/wagtailadmin/css/core.less         | 37 ++++++++++++++++---
 .../templates/wagtailadmin/base.html          |  2 +-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index e84a61582..e91c1d1dd 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -219,7 +219,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
             left:0;
             top:0;
             width:2em;
-            line-height:2em;
+            line-height:2.3em;
             height:100%;
             text-align:center;    
             background-color:rgba(0,0,0,0.2);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 93c390daa..3367be564 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -125,12 +125,23 @@ img{
     .logo{
         display:block;
         margin:2em auto;
-        text-align:center;
+        text-align:left;
         text-decoration:none;
         color:white;
+        padding: 0.9em 1.2em;
+        margin:0;
+        font-size:0.9em;
+        -webkit-font-smoothing: auto;
         
+        span{
+            text-transform:uppercase;
+        }
+
         img{
+            width:20px;
+            float:left;
             border:0;
+            margin-right:1em;
         }
     }
 
@@ -153,8 +164,8 @@ img{
     }
 
     .nav-main{
-        position:absolute;
-        top: 150px;
+       
+        top: 43px;
         bottom: 0px;
         overflow: auto;
         width:100%;
@@ -318,7 +329,7 @@ img{
 
     .explorer{
         position:absolute;
-        margin-top:149px; /* same as .nav-main minus 1 pixel for border */
+        margin-top:70px;
         font-size:0.9em;
     }
 
@@ -391,7 +402,7 @@ header{
     }
 
     h1{
-        line-height:1.7em;
+       padding:0.2em 0;
     }
 
     .left, .right{
@@ -691,6 +702,19 @@ footer, .logo{
             width:@menu-width;
         }
     }
+        .logo{
+            margin:2em auto;
+            text-align:center;
+
+            span{
+                display:none;
+            }
+            img{
+                width:80px;
+                float:none;
+                margin:auto;
+            }
+        }
 
     .content{
         border-top:0;
@@ -703,6 +727,8 @@ footer, .logo{
     }
 
     .nav-main{
+        position:absolute;
+        top: 150px;
         margin-bottom: 116px; /* WARNING: magic number - the height of the .footer */
 
         .footer{
@@ -740,6 +766,7 @@ footer, .logo{
         position: absolute;
         top:0;
         left:99%;
+        margin-top:149px; /* same as .nav-main minus 1 pixel for border */
     }
     .dl-menu {
         position: absolute;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
index 85d532d5b..ff1aa75ae 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/base.html
@@ -5,7 +5,7 @@
     <div id="nav-toggle" data-afteropen="Collapse" class="icon text-replace">Menu</div>
     <div class="nav-wrapper">
         <div class="inner">
-            <a href="{% url 'wagtailadmin_home' %}" class="logo"><img src="{{ STATIC_URL }}wagtailadmin/images/wagtail-logo.svg" alt="Wagtail" width="80px" /></a>
+            <a href="{% url 'wagtailadmin_home' %}" class="logo"><img src="{{ STATIC_URL }}wagtailadmin/images/wagtail-logo.svg" alt="Wagtail" width="80" /><span>Dashboard</span></a>
             {% main_nav %}
         </div>