dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fixs on mobile nav

Browse Source
This commit is contained in:
Kevin Granger
2013-11-08 18:31:07 +01:00
parent c5b3d20b96
commit d3100acef2
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
-1
View File
@@ -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 { background-color: #686d7d; color: white; }
#nav-mobile ul.menu li a:hover i { color: white; } #nav-mobile ul.menu li a:hover i { color: white; }
#nav-mobile ul.submenu { display: none; } #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 #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 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; } #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; }
admin-dev/themes/default/js/admin-theme.js
+4 -4
View File
@@ -100,7 +100,6 @@ $( document ).ready(function() {
function mobileNav() { function mobileNav() {
//clean actual menu type //clean actual menu type
//$('body').removeClass('page-sidebar').removeClass('page-topbar').removeClass('page-sidebar-closed');
// get it in navigation whatever type it is. // get it in navigation whatever type it is.
var navigation = $('#nav-sidebar,#nav-topbar'); var navigation = $('#nav-sidebar,#nav-topbar');
var submenu = ""; var submenu = "";
@@ -137,7 +136,8 @@ $( document ).ready(function() {
}); });
navigation.on('click.back','#nav-mobile-submenu-back',function(e){ navigation.on('click.back','#nav-mobile-submenu-back',function(e){
e.preventDefault(); 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>'); $('span.menu-collapse').html('<i class="icon-align-justify"></i>');
navigation.off(); navigation.off();
if ($('body').hasClass('page-sidebar')){ if ($('body').hasClass('page-sidebar')){
navigation.attr('id',"nav-sidebar") navigation.attr('id',"nav-sidebar");
navSidebar(); navSidebar();
} else if ($('body').hasClass('page-sidebar')){ } else if ($('body').hasClass('page-sidebar')){
navigation.attr('id',"nav-topbar") navigation.attr('id',"nav-topbar");
navTopbar(); navTopbar();
} }
} }
admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
-1
View File
@@ -64,7 +64,6 @@
ul.submenu ul.submenu
display: none display: none
#nav-mobile-submenu #nav-mobile-submenu
z-index: 1200
a:not(#nav-mobile-submenu-back) a:not(#nav-mobile-submenu-back)
font-size: 1.2em font-size: 1.2em
padding-left: 50px padding-left: 50px