From e8dd039dce2c6f62d84c0e99de4ec574ecd0d46c Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 24 Jul 2014 11:10:42 +0100
Subject: [PATCH] ongoing tweaks

---
 .../static/wagtailadmin/js/core.js            |  7 +++++--
 .../static/wagtailadmin/scss/core.scss        | 21 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js
index 980658efb..51056d446 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js
@@ -22,9 +22,12 @@ $(function(){
     });
 
     $('.nav-main a').on('click', function(){
-        $('.nav-wrapper').toggleClass('submenu-active')
         $(this).closest('li').toggleClass('active');
-        return false
+        
+        if($(this).closest('li').find('.submenu')){
+            $('.nav-wrapper').toggleClass('submenu-active')
+            return false
+        }
     })
 
     // Enable swishy section navigation menu
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 5866a84c1..4768ef9e4 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -229,20 +229,33 @@ img{
             }
         }
 
+        li.active > a{
+            color:$color-orange;
+        }
+
+        li.active .submenu{
+            @include transition(width 0.2s ease);
+        }
+
         .submenu{
             @include transition(width 0.2s ease);
             background:$selected-highlight;
             position:fixed;
             height:100%;
             width:0;
+            padding:0;
             top:0;
             left:150px;
-            padding:0;
             overflow:auto;
             max-height:100%;
             border-right:1px solid rgba(0,0,0,0.1);
             @include box-shadow(5px 0 5px rgba(0,0,0,0.1));
 
+            h2,ul{
+                float:right;
+                width:150px;
+            }
+
             h2{
                 padding:0.2em 0;
                 font-weight:500;
@@ -274,14 +287,16 @@ img{
                     background-color:rgba(100,100,100,0.2);
                 }
             }
-            
-
         }
 
         li.active .submenu{
             width:150px;
             padding:0 1.5em 1.5em 1.5em;
         }
+        li .submenu{
+            width:0;
+            padding:0;
+        }
 
         .avatar{
             display:none;