adulau/brouilleursdeblanc
1
0
Fork 0
mirror of https://github.com/adulau/brouilleursdeblanc.git synced 2024-11-07 12:06:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/bugfixes' into develop

Browse source
This commit is contained in:
Michael Rose 2013-08-19 10:40:31 -04:00
commit b27140008a
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/css/main.css
View file

@ -680,7 +680,7 @@ body{margin:0;padding:0;width:100%;background-color:#ffffff;border-top:5px solid
.navigation-wrapper li{display:block;float:left;list-style:none;text-align:center;font-size:14px;font-size:0.875rem;text-transform:uppercase;color:#ffffff;}.navigation-wrapper li a:hover{-webkit-box-shadow:inset 0 0 1px #ffffff;-moz-box-shadow:inset 0 0 1px #ffffff;box-shadow:inset 0 0 1px #ffffff;} .navigation-wrapper li{display:block;float:left;list-style:none;text-align:center;font-size:14px;font-size:0.875rem;text-transform:uppercase;color:#ffffff;}.navigation-wrapper li a:hover{-webkit-box-shadow:inset 0 0 1px #ffffff;-moz-box-shadow:inset 0 0 1px #ffffff;box-shadow:inset 0 0 1px #ffffff;}
.navigation-wrapper a{display:block;padding:6px 10px;color:#ffffff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navigation-wrapper a:hover{background-color:#1a1a1a;} .navigation-wrapper a{display:block;padding:6px 10px;color:#ffffff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navigation-wrapper a:hover{background-color:#1a1a1a;}
#site-nav{z-index:9000;display:none;}@media only screen and (min-width: 48em){#site-nav{-webkit-animation-duration:1s;-moz-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;}}@media only screen and (min-width: 48em){#site-nav.closed{display:block;}} #site-nav{z-index:9000;display:none;}@media only screen and (min-width: 48em){#site-nav{-webkit-animation-duration:1s;-moz-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;}}@media only screen and (min-width: 48em){#site-nav.closed{display:block;}}
#site-nav.opened{display:block;max-height:100%;}#site-nav.opened li{float:none;} #site-nav.opened{display:block;max-height:100%;}#site-nav.opened li{float:none;}@media only screen and (min-width: 48em){#site-nav.opened li{float:left;}}
.no-js #site-nav{display:block;} .no-js #site-nav{display:block;}
#nav-toggle{z-index:9999;display:block;vertical-align:top;margin:0;padding:4px 20px;background-color:#000000;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}@media only screen and (min-width: 48em){#nav-toggle{display:none;}} #nav-toggle{z-index:9999;display:block;vertical-align:top;margin:0;padding:4px 20px;background-color:#000000;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}@media only screen and (min-width: 48em){#nav-toggle{display:none;}}
.masthead{margin-top:40px;*zoom:1;}.masthead:before,.masthead:after{display:table;content:"";line-height:0;} .masthead{margin-top:40px;*zoom:1;}.masthead:before,.masthead:after{display:table;content:"";line-height:0;}

4
assets/js/main.js
View file

@ -551,10 +551,10 @@ var responsiveNav = (function (window, document) {
if (opts.animate) { if (opts.animate) {
setTimeout(function () { setTimeout(function () {
nav.style.position = "absolute"; nav.style.position = "relative";
}, opts.transition + 10); }, opts.transition + 10);
} else { } else {
nav.style.position = "absolute"; nav.style.position = "relative";
} }
navOpen = false; navOpen = false;

2
assets/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
assets/less/page.less
View file

@ -56,7 +56,6 @@ body {
animation-duration: 1s; animation-duration: 1s;
} }
&.closed { &.closed {
@media @medium { @media @medium {
display: block; display: block;
} }
@ -66,6 +65,9 @@ body {
max-height: 100%; max-height: 100%;
li { li {
float: none; float: none;
@media @medium {
float: left;
}
} }
} }
} }