From 3b63eb78dc71cee5a0276907128af1b230af33d0 Mon Sep 17 00:00:00 2001
From: Matthew Harrison-Jones <matthojo@gmail.com>
Date: Tue, 25 Jun 2013 12:30:00 +0100
Subject: [PATCH] Fixed menus not hiding

Also fixed `.dropdown` usage on menu bar.
---
 core/admin/assets/js/toggle.js             | 3 ++-
 core/admin/assets/sass/modules/global.scss | 9 ++-------
 core/admin/assets/tpl/preview.hbs          | 2 +-
 core/admin/views/partials/navbar.hbs       | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/core/admin/assets/js/toggle.js b/core/admin/assets/js/toggle.js
index b46340d90c..e38a13a9db 100644
--- a/core/admin/assets/js/toggle.js
+++ b/core/admin/assets/js/toggle.js
@@ -13,9 +13,10 @@
 
         $el.find('[data-toggle]').on('click', function (e) {
             e.preventDefault();
+            e.stopPropagation();
             $(this).toggleClass('active');
             var toggle = $(this).data('toggle');
-            $(this).parent().children(toggle).fadeToggle(100).toggleClass('open');
+            $(this).parent().children(toggle).fadeToggle(200).toggleClass('open');
         });
 
     };
diff --git a/core/admin/assets/sass/modules/global.scss b/core/admin/assets/sass/modules/global.scss
index 14fb5cae5d..65d8846697 100644
--- a/core/admin/assets/sass/modules/global.scss
+++ b/core/admin/assets/sass/modules/global.scss
@@ -643,12 +643,6 @@ nav {
                 @include transition(left 0.3s ease 0s);
             }
             > a {
-                @include icon-after($i-chevron-down, 12px) {
-                    position:absolute;
-                    right: 20px;
-                    top: 15px;
-                }
-
                 &:hover { background: inherit; }
                 &.active { background: darken($grey, 3%); }
             }
@@ -694,7 +688,8 @@ nav {
     };
 
     &.active {
-        @include icon-after($i-chevron-down, 8px, $darkgrey);
+        color: $darkgrey;
+        @include icon-after($i-chevron-down, 8px);
     }
 }
 
diff --git a/core/admin/assets/tpl/preview.hbs b/core/admin/assets/tpl/preview.hbs
index 604cf3e6f6..53085eba32 100644
--- a/core/admin/assets/tpl/preview.hbs
+++ b/core/admin/assets/tpl/preview.hbs
@@ -9,7 +9,7 @@
     <section class="post-controls">
         <a class="post-edit" href="#"><span class="hidden">Edit Post</span></a>
         <a class="post-settings" href="#" data-toggle=".menu-drop-right"><span class="hidden">Post Settings</span></a>
-        <ul class="menu-drop-right">
+        <ul class="menu-drop-right overlay">
             <li><a href="#" class="url">URL</a></li>
             <li><a href="#" class="something">Something</a></li>
             <li><a href="#" class="delete">Delete</a></li>
diff --git a/core/admin/views/partials/navbar.hbs b/core/admin/views/partials/navbar.hbs
index 552fb83ca0..40136a7fcd 100644
--- a/core/admin/views/partials/navbar.hbs
+++ b/core/admin/views/partials/navbar.hbs
@@ -8,11 +8,11 @@
             {{/each}}
 
             <li id="usermenu" class="subnav">
-                <a href="#" data-toggle="ul">
+                <a href="#" data-toggle="ul" class="dropdown">
                     <img class="avatar" src="/core/admin/assets/img/user.jpg" alt="Avatar" />
                     <span class="name">User Menu</span>
                 </a>
-                <ul>
+                <ul class="overlay">
                     <li class="usermenu-profile"><a href="#">Your Profile</a></li>
                     <li class="divider"></li>
                     <li class="usermenu-help"><a href="#">Help / Support</a></li>