adulau/brouilleursdeblanc
1
0
Fork 0
mirror of https://github.com/adulau/brouilleursdeblanc.git synced 2024-11-22 01:57:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Michael Rose 2013-06-26 09:38:32 -04:00
commit 91ab589783
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/css/main.css
View file

@ -568,7 +568,7 @@ body{margin:0;padding:0;width:100%;background-color:#ffffff;border-top:5px solid
.navigation-wrapper ul:after{clear:both;} .navigation-wrapper ul:after{clear:both;}
.navigation-wrapper li{display:block;float:left;list-style:none;padding:6px 10px;text-align:center;font-size:14px;font-size:0.875rem;text-transform:uppercase;color:#ffffff;border:1px solid #000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navigation-wrapper li:hover{border:1px solid #ffffff;border-bottom:1px solid #808080;border:1px solid rgba(255, 255, 255, 0.5);} .navigation-wrapper li{display:block;float:left;list-style:none;padding:6px 10px;text-align:center;font-size:14px;font-size:0.875rem;text-transform:uppercase;color:#ffffff;border:1px solid #000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navigation-wrapper li:hover{border:1px solid #ffffff;border-bottom:1px solid #808080;border:1px solid rgba(255, 255, 255, 0.5);}
.navigation-wrapper a{color:#ffffff;} .navigation-wrapper a{color:#ffffff;}
#site-nav{z-index:9999;-webkit-animation-duration:1s;-moz-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;-webkit-animation-delay:.05s;-moz-animation-delay:.05s;-o-animation-delay:.05s;animation-delay:.05s;}#site-nav.closed{display:none;}@media only screen and (min-width: 48em){#site-nav.closed{display:block;}} #site-nav{z-index:9999;}@media only screen and (min-width: 48em){#site-nav{-webkit-animation-duration:1s;-moz-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;-webkit-animation-delay:.05s;-moz-animation-delay:.05s;-o-animation-delay:.05s;animation-delay:.05s;}}#site-nav.closed{display:none;}@media only screen and (min-width: 48em){#site-nav.closed{display:block;}}
#site-nav.opened{max-height:100%;}#site-nav.opened li{float:none;} #site-nav.opened{max-height:100%;}#site-nav.opened li{float:none;}
#nav-toggle{display:block;vertical-align:top;margin:0;padding:4px 20px;background-color:#000000;}@media only screen and (min-width: 48em){#nav-toggle{display:none;}} #nav-toggle{display:block;vertical-align:top;margin:0;padding:4px 20px;background-color:#000000;}@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;}

18
assets/less/page.less
View file

@ -48,14 +48,16 @@ body {
// Responsive nav toggle stuff // Responsive nav toggle stuff
#site-nav { #site-nav {
z-index: 9999; z-index: 9999;
-webkit-animation-duration: 1s; @media @medium {
-moz-animation-duration: 1s; -webkit-animation-duration: 1s;
-o-animation-duration: 1s; -moz-animation-duration: 1s;
animation-duration: 1s; -o-animation-duration: 1s;
-webkit-animation-delay: .05s; animation-duration: 1s;
-moz-animation-delay: .05s; -webkit-animation-delay: .05s;
-o-animation-delay: .05s; -moz-animation-delay: .05s;
animation-delay: .05s; -o-animation-delay: .05s;
animation-delay: .05s;
}
&.closed { &.closed {
display: none; display: none;
@media @medium { @media @medium {