From d3100acef206e4004fa76ae52f82ff00158ac817 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Fri, 8 Nov 2013 18:31:07 +0100
Subject: [PATCH] // fixs on mobile nav

---
 admin-dev/themes/default/css/admin-theme.css              | 1 -
 admin-dev/themes/default/js/admin-theme.js                | 8 ++++----
 admin-dev/themes/default/scss/admin-theme/_admin-nav.sass | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 0257590a4..e9cfd7f9a 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -3538,7 +3538,6 @@ a.link-social:hover { text-decoration: none; }
 #nav-mobile ul.menu li a:hover { background-color: #686d7d; color: white; }
 #nav-mobile ul.menu li a:hover i { color: white; }
 #nav-mobile ul.submenu { display: none; }
-#nav-mobile #nav-mobile-submenu { z-index: 1200; }
 #nav-mobile #nav-mobile-submenu a:not(#nav-mobile-submenu-back) { font-size: 1.2em; padding-left: 50px; text-transform: none; }
 #nav-mobile a#nav-mobile-submenu-back { background-color: #454953; font-size: 1.5em; }
 #nav-mobile ul.menu.menu-close { -webkit-animation: fadeOutLeft 0.2s 0.2s ease both; -moz-animation: fadeOutLeft 0.2s 0.2s ease both; -ms-animation: fadeOutLeft 0.2s 0.2s ease both; -o-animation: fadeOutLeft 0.2s 0.2s ease both; animation: fadeOutLeft 0.2s 0.2s ease both; }
diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js
index dd8081508..203774ebf 100755
--- a/admin-dev/themes/default/js/admin-theme.js
+++ b/admin-dev/themes/default/js/admin-theme.js
@@ -100,7 +100,6 @@ $( document ).ready(function() {
 
 	function mobileNav() {
 		//clean actual menu type
-		//$('body').removeClass('page-sidebar').removeClass('page-topbar').removeClass('page-sidebar-closed');
 		// get it in navigation whatever type it is.
 		var navigation = $('#nav-sidebar,#nav-topbar');
 		var submenu = "";
@@ -137,7 +136,8 @@ $( document ).ready(function() {
 		});
 		navigation.on('click.back','#nav-mobile-submenu-back',function(e){
 			e.preventDefault();
-			navigation.find('.menu').removeClass('menu-close').show(submenu.addClass('menu-close'));
+			submenu.remove();
+			navigation.find('.menu').removeClass('menu-close').show();
 		});
 	}
 
@@ -147,10 +147,10 @@ $( document ).ready(function() {
 		$('span.menu-collapse').html('<i class="icon-align-justify"></i>');
 		navigation.off();
 		if ($('body').hasClass('page-sidebar')){
-			navigation.attr('id',"nav-sidebar")
+			navigation.attr('id',"nav-sidebar");
 			navSidebar();
 		} else if ($('body').hasClass('page-sidebar')){
-			navigation.attr('id',"nav-topbar")
+			navigation.attr('id',"nav-topbar");
 			navTopbar();
 		}
 	}
diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass b/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
index dfbbb1e91..44358c2ae 100644
--- a/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
+++ b/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
@@ -64,7 +64,6 @@
 	ul.submenu
 		display: none
 	#nav-mobile-submenu
-		z-index: 1200
 		a:not(#nav-mobile-submenu-back)
 			font-size: 1.2em
 			padding-left: 50px