adulau/brouilleursdeblanc
1
0
Fork 0
mirror of https://github.com/adulau/brouilleursdeblanc.git synced 2024-11-21 17:47:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/navigation-links' into develop

Browse source
This commit is contained in:
Michael Rose 2013-07-19 08:54:07 -04:00
commit 675290e20a
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
_includes/navigation.html
View file

@ -4,7 +4,7 @@
{% for link in site.links %}
<li><a href="{% if link.external %}{{ link.url }}{% else %}{{ site.url }}{{ link.url }}{% endif %}" {% if link.external %}target="_blank"{% endif %}>{{ link.title }}</a></li>
{% endfor %}
<li><i class="icon-rss"></i> <a href="{{ site.url }}/feed.xml" title="Atom/RSS feed">Feed</a>
<li><a href="{{ site.url }}/feed.xml" title="Atom/RSS feed"><i class="icon-rss"></i> Feed</a>
</ul>
</nav>
</div><!-- /.navigation-wrapper -->

6
assets/css/main.css
View file

@ -567,12 +567,12 @@ body{margin:0;padding:0;width:100%;background-color:#ffffff;border-top:5px solid
.navigation-wrapper:after{clear:both;}
.navigation-wrapper ul{display:inline-block;vertical-align:top;margin:0 0 50px;padding:4px 20px;background-color:#000000;-webkit-border-radius:0 0 10px 10px;-moz-border-radius:0 0 10px 10px;border-radius:0 0 10px 10px;*zoom:1;}.navigation-wrapper ul:before,.navigation-wrapper ul:after{display:table;content:"";line-height:0;}
.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 a{color:#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 a{display:block;padding:6px 10px;color:#ffffff;border:1px solid #000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navigation-wrapper a:hover{border:1px solid #ffffff;border-bottom:1px solid #808080;border:1px solid rgba(255, 255, 255, 0.5);}
#site-nav{z-index:9999;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;-webkit-animation-delay:.05s;-moz-animation-delay:.05s;-o-animation-delay:.05s;animation-delay:.05s;}}@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;}
.no-js #site-nav{display:block;}
#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;-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}@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:after{clear:both;}
@media only screen and (min-width: 48em){.masthead{margin-top:0;}}.masthead .wrap{text-align:center;max-width:27.5em;padding-right:20px;padding-left:20px;}@media only screen and (min-width: 48em){.masthead .wrap{max-width:45.5em;padding-right:60px;padding-left:60px;}}@media only screen and (min-width: 62.5em){.masthead .wrap{max-width:60em;}}

12
assets/less/page.less
View file

@ -27,11 +27,15 @@ body {
display: block;
float: left;
list-style: none;
padding: 6px 10px;
text-align: center;
.font-rem(14);
text-transform: uppercase;
color: @white;
}
a {
display: block;
padding: 6px 10px;
color: @white;
border: 1px solid @black;
.rounded(4px);
&:hover {
@ -40,9 +44,6 @@ body {
border: 1px solid fade(@white,50);
}
}
a {
color: @white;
}
}
// Responsive nav toggle stuff
#site-nav {
@ -81,6 +82,7 @@ body {
margin: 0;
padding: 4px 20px;
background-color: @black;
.rounded(0 0 4px 4px);
@media @medium {
display: none;
}
@ -391,7 +393,6 @@ span + .entry-title {
// Chrome Frame
// --------------------------------------------------
.upgrade {
padding: 10px;
text-align: center;
@ -399,7 +400,6 @@ span + .entry-title {
// Google Search
// --------------------------------------------------
#goog-fixurl {
ul {
list-style: none;