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

// fix nav

Browse Source
This commit is contained in:
Kevin Granger
2013-09-16 09:50:34 +02:00
parent 533003faa0
commit 2af6c30bde
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/_nav.sass
+5 -10
View File
@@ -95,7 +95,7 @@
background-color: transparent background-color: transparent
@extend .icon-angle-down @extend .icon-angle-down
@include text-shadow(lighten($main-color,10%) 1px 1px 0) @include text-shadow(lighten($main-color,10%) 1px 1px 0)
&:hover &:hover
color: white color: white
@include text-shadow(darken($main-color,20%) -1px -1px 0) @include text-shadow(darken($main-color,20%) -1px -1px 0)
@@ -131,8 +131,6 @@
width: 100% width: 100%
z-index: 600 z-index: 600
background-color: white background-color: white
border-top: black solid 1px
border-bottom: darken($secondary-color,20%) solid 1px
ul.menu ul.menu
height: 28px height: 28px
margin: 0 margin: 0
@@ -140,17 +138,16 @@
display: block display: block
list-style: none list-style: none
> li > li
height: 26px height: 28px
padding: 0 padding: 0
margin: 0 margin: 0
border-right: solid 1px #aaa border-right: solid 1px #aaa
list-style: none list-style: none
position: relative position: relative
float: left float: left
@include box-shadow(#ccc 0 -2px 0 inset)
> a > a
display: block display: block
line-height: 26px line-height: 28px
color: $main-color color: $main-color
padding: 0 6px padding: 0 6px
margin: 0 margin: 0
@@ -166,12 +163,11 @@
i i
color: white!important color: white!important
&.active &.active
border-right: solid 1px black
> a > a
color: contrast-color($main-color, white, #333, 10%) color: contrast-color($main-color, white, #333, 10%)
background-color: $main-color background-color: $main-color
i i
color: black color: white
.menu-collapse .menu-collapse
display: none display: none
ul.submenu ul.submenu
@@ -187,8 +183,7 @@
margin: 0 margin: 0
padding: 0 padding: 0
left: 0 left: 0
top: 26px top: 28px
border-top: solid 1px darken($main-color,10%)
width: 200px!important width: 200px!important
li li
width: 200px width: 200px
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/js/admin-theme.js
+1 -1
View File
@@ -27,7 +27,7 @@ $( document ).ready(function() {
//nav side bar //nav side bar
function navSidebar(){ function navSidebar(){
$('.expanded').removeClass('expanded'); $('.expanded').removeClass('expanded');
$('.submenu').not('.active').hide(); $('.maintab').not('.active').closest('.submenu').hide();
$('#nav-sidebar li.maintab.has_submenu').append('<span class="submenu_expand"></span>'); $('#nav-sidebar li.maintab.has_submenu').append('<span class="submenu_expand"></span>');
$('#nav-sidebar .submenu_expand').on('click',function(){ $('#nav-sidebar .submenu_expand').on('click',function(){
var $navId = $(this).parent(); var $navId = $(this).parent();