// fix nav
This commit is contained in:
Kevin Granger committed
1 parent
be0592d5a2
commit
bcfd092a1d
5 files changed
+77
-94
No files matched your search
@@ -11,87 +11,82 @@
|
||||
border-top: 1px black solid
|
||||
list-style: none
|
||||
li.maintab > a > i
|
||||
font-size: 20px
|
||||
@include border-radius(40px)
|
||||
display: inline-block
|
||||
height: 30px
|
||||
width: 30px
|
||||
color: white
|
||||
display: inline-block
|
||||
text-align: center
|
||||
font-size: 20px
|
||||
line-height: 30px
|
||||
color: white
|
||||
text-align: center
|
||||
@include border-radius(40px)
|
||||
li:not(.active)
|
||||
ul
|
||||
display: none
|
||||
li.expanded
|
||||
color: lighten($main-color,30%)!important
|
||||
span.submenu_expand
|
||||
@extend .icon-angle-up
|
||||
ul.submenu
|
||||
display: block
|
||||
li a
|
||||
color: lighten($main-color,30%)!important
|
||||
background-color: darken($main-color,20%)!important
|
||||
border-bottom: solid 1px lighten($main-color,10%)!important
|
||||
&:last-child a
|
||||
border: none!important
|
||||
|
||||
|
||||
li.active
|
||||
span.submenu_expand
|
||||
display: none
|
||||
> ul.menu > li.maintab
|
||||
position: relative
|
||||
&.active > a
|
||||
color: contrast-color($brand-primary, white, #333, 10%)
|
||||
background-color: $brand-primary
|
||||
i
|
||||
color: black
|
||||
background-color: white
|
||||
&.active:hover > a
|
||||
color: contrast-color($main-color, white, #333, 10%)
|
||||
&:hover > a
|
||||
i
|
||||
background-color: white
|
||||
> a
|
||||
display: block
|
||||
ul.menu
|
||||
li.maintab
|
||||
position: relative
|
||||
padding: 2px 0 2px 8px
|
||||
border-bottom: 1px solid darken($main-color,10%)
|
||||
font-size: 12px
|
||||
line-height: 28px
|
||||
$color: contrast-color($main-color, white, #333, 10%)
|
||||
color: mix($main-color, $color, 30%)
|
||||
background-color: $main-color
|
||||
text-transform: uppercase
|
||||
text-decoration: none
|
||||
@include transition-property(background-color, border, box-shadow)
|
||||
@include transition-duration(0.4s)
|
||||
@include transition-timing-function(ease-out)
|
||||
i
|
||||
color: lighten($main-color,25%)
|
||||
background-color: darken($main-color,25%)
|
||||
@include transition-property(color)
|
||||
&.active > a
|
||||
color: contrast-color($brand-primary, white, #333, 10%)
|
||||
background-color: $brand-primary
|
||||
i
|
||||
color: black
|
||||
background-color: white
|
||||
&.active > a:hover
|
||||
color: contrast-color($main-color, white, #333, 10%)
|
||||
&.expanded
|
||||
color: lighten($main-color,30%)!important
|
||||
background-color: darken($main-color,10%)
|
||||
span.submenu_expand
|
||||
@extend .icon-angle-up
|
||||
ul.submenu
|
||||
display: block
|
||||
li a
|
||||
color: lighten($main-color,30%)
|
||||
background-color: darken($main-color,20%)
|
||||
border-bottom: solid 1px darken($main-color,20%)
|
||||
&:last-child a
|
||||
border: none
|
||||
> a
|
||||
display: block
|
||||
position: relative
|
||||
padding: 2px 0 2px 8px
|
||||
border-bottom: 1px solid darken($main-color,10%)
|
||||
font-size: 12px
|
||||
line-height: 28px
|
||||
$color: contrast-color($main-color, white, #333, 10%)
|
||||
color: mix($main-color, $color, 30%)
|
||||
background-color: $main-color
|
||||
text-transform: uppercase
|
||||
text-decoration: none
|
||||
@include transition-property(background-color, border, box-shadow)
|
||||
@include transition-duration(0.4s)
|
||||
@include transition-timing-function(ease-out)
|
||||
&:hover
|
||||
color: white
|
||||
span.submenu_expand
|
||||
position: absolute
|
||||
right: 10px
|
||||
top: 2px
|
||||
cursor: pointer
|
||||
@extend .icon-angle-down
|
||||
font-family: FontAwesome
|
||||
font-size: 24px
|
||||
font-weight: 100
|
||||
color: black
|
||||
@include text-shadow(lighten($main-color,10%) 1px 1px 0)
|
||||
background-color: transparent
|
||||
&:hover
|
||||
color: white
|
||||
@include text-shadow(darken($main-color,20%) -1px -1px 0)
|
||||
@media (max-width: $screen-tablet)
|
||||
display: none
|
||||
i
|
||||
color: lighten($main-color,25%)
|
||||
background-color: darken($main-color,25%)
|
||||
@include transition-property(color)
|
||||
@include transition-duration(0.4s)
|
||||
@include transition-timing-function(ease-out)
|
||||
&:hover
|
||||
color: white
|
||||
span.submenu_expand
|
||||
position: absolute
|
||||
right: 10px
|
||||
top: 2px
|
||||
cursor: pointer
|
||||
@extend .icon-angle-down
|
||||
font-family: FontAwesome
|
||||
font-size: 24px
|
||||
font-weight: 100
|
||||
color: black
|
||||
@include text-shadow(lighten($main-color,10%) 1px 1px 0)
|
||||
background-color: transparent
|
||||
&:hover
|
||||
color: white
|
||||
@include text-shadow(darken($main-color,20%) -1px -1px 0)
|
||||
ul.submenu
|
||||
list-style: none
|
||||
padding: 0
|
||||
@@ -113,6 +108,8 @@
|
||||
color: contrast-color($brand-primary, white, #333, 10%)
|
||||
background-color: $brand-primary
|
||||
border-bottom: solid 1px darken($brand-primary,10%)
|
||||
@media (max-width: $screen-tablet)
|
||||
display: none
|
||||
|
||||
#nav-topbar
|
||||
position: fixed
|
||||
@@ -266,45 +263,30 @@
|
||||
|
||||
.icon-AdminDashboard
|
||||
@extend .icon-dashboard
|
||||
background-color: adjust-hue($icon-color, 0)
|
||||
.icon-AdminCatalog
|
||||
@extend .icon-book
|
||||
background-color: adjust-hue($icon-color, 30)
|
||||
.icon-AdminParentOrders
|
||||
@extend .icon-credit-card
|
||||
background-color: adjust-hue($icon-color, 60)
|
||||
.icon-AdminParentCustomer
|
||||
@extend .icon-group
|
||||
background-color: adjust-hue($icon-color, 90)
|
||||
.icon-AdminPriceRule
|
||||
@extend .icon-tags
|
||||
background-color: adjust-hue($icon-color, 120)
|
||||
.icon-AdminParentShipping
|
||||
@extend .icon-truck
|
||||
background-color: adjust-hue($icon-color, 150)
|
||||
.icon-AdminParentLocalization
|
||||
@extend .icon-globe
|
||||
background-color: adjust-hue($icon-color, 180)
|
||||
.icon-AdminParentModules
|
||||
@extend .icon-puzzle-piece
|
||||
background-color: adjust-hue($icon-color, 210)
|
||||
.icon-AdminParentPreferences
|
||||
@extend .icon-wrench
|
||||
background-color: adjust-hue($icon-color, 240)
|
||||
.icon-AdminTools
|
||||
@extend .icon-cogs
|
||||
background-color: adjust-hue($icon-color, 270)
|
||||
.icon-AdminAdmin
|
||||
@extend .icon-cog
|
||||
background-color: adjust-hue($icon-color, 300)
|
||||
.icon-AdminParentStats
|
||||
@extend .icon-bar-chart
|
||||
background-color: adjust-hue($icon-color, 330)
|
||||
.icon-AdminStock
|
||||
@extend .icon-archive
|
||||
background-color: adjust-hue($icon-color, 360)
|
||||
|
||||
[class^="icon-Admin"]
|
||||
background-color: black
|
||||
margin-right: 6px
|
||||
color: white
|
||||
@@ -30,4 +30,4 @@
|
||||
* Email: dave@fontawesome.io
|
||||
* Twitter: http://twitter.com/byscuits
|
||||
* Work: Lead Product Designer @ Kyruus - http://kyruus.com
|
||||
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3 .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3 [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3 [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,.nav [class^="icon-Line truncated
|
||||
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3 .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3 [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3 [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,.nav [class^="icon-Line truncated
|
||||
@@ -124,8 +124,7 @@ html, body
|
||||
border-left: solid 1px #ccc
|
||||
&:hover
|
||||
text-decoration: none
|
||||
color: white
|
||||
background-color: $brand-primary
|
||||
color: black
|
||||
i
|
||||
text-align: center
|
||||
font-size: 1.2em
|
||||
@@ -304,7 +303,7 @@ input[type="password"].input-tiny
|
||||
td.actions
|
||||
min-width: 200px
|
||||
.btn-group-action
|
||||
min-width: 200px
|
||||
float: right
|
||||
a
|
||||
text-decoration: none
|
||||
|
||||
@@ -338,12 +337,14 @@ hr
|
||||
border-collapse: separate
|
||||
border-spacing: 0 2px
|
||||
margin-bottom: 5px
|
||||
thead th
|
||||
background-color: darken($bg-content-color,10%)
|
||||
thead > tr > th
|
||||
border: none
|
||||
font-weight: normal
|
||||
vertical-align: top
|
||||
span.title_box
|
||||
color: black
|
||||
font-size: 1.1em
|
||||
font-weight: bold
|
||||
display: block
|
||||
word-wrap: nowrap
|
||||
white-space: nowrap
|
||||
@@ -363,6 +364,7 @@ hr
|
||||
vertical-align: middle
|
||||
word-wrap: nowrap
|
||||
font-size: 12px
|
||||
border-bottom: solid 1px #eee
|
||||
//@include box-shadow(rgba(black,0.15) 0 1px 0)
|
||||
|
||||
td.center, th.center
|
||||
@@ -376,7 +378,7 @@ hr
|
||||
|
||||
//filter table
|
||||
tr.filter
|
||||
background-color: $bg-content-color
|
||||
background-color: lighten($brand-primary,25%)
|
||||
input[type="text"].filter, input[type="password"].filter, select.filter
|
||||
font-size: 12px
|
||||
|
||||
|
||||
@@ -49,6 +49,7 @@ $( document ).ready(function() {
|
||||
}
|
||||
//nav top bar
|
||||
function navTopbar(){
|
||||
$('span.submenu_expand').remove();
|
||||
$('.expanded').removeClass('expanded');
|
||||
|
||||
$('#nav-topbar').on('mouseenter', 'li.maintab.has_submenu',
|
||||
@@ -80,7 +81,6 @@ $( document ).ready(function() {
|
||||
|
||||
//nav switch
|
||||
function navSwitch(){
|
||||
|
||||
if ($('body').hasClass('page-sidebar')||$('body').hasClass('page-sidebar-closed')) {
|
||||
$('body').removeClass('page-sidebar').removeClass('page-sidebar-closed').addClass('page-topbar');
|
||||
$('#nav-sidebar').attr('id','nav-topbar');
|
||||
@@ -101,7 +101,6 @@ $( document ).ready(function() {
|
||||
navTopbar();
|
||||
}
|
||||
|
||||
|
||||
$('#header_shopname').on('click',
|
||||
function(e){
|
||||
e.preventDefault();
|
||||
|
||||
@@ -303,7 +303,7 @@
|
||||
</th>
|
||||
{/if}
|
||||
{if $has_actions}
|
||||
<th>{l s='Actions'}{if !$simple_header}{/if}</th>
|
||||
<th>{if !$simple_header}{/if}</th>
|
||||
{/if}
|
||||
</tr>
|
||||
{if !$simple_header && $show_filters}
|
||||
|
||||
Reference in new issue
Block a user