steffen/website
1
0
Fork 0
Code Actions Packages Releases Activity

Wrap all page content in #main div to fix #86

Browse Source 
- Adjust article styles to correctly display post indexes
- Remove top margin from page titles
This commit is contained in:
Michael Rose
2014-09-30 16:07:20 -04:00
parent 1a837bbdb5
commit 99d4eee5bb
5 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
_layouts/home.html
View File

@ -28,10 +28,10 @@
</div><!-- /.image-wrap --> </div><!-- /.image-wrap -->
{% endif %} {% endif %}
<div id="main" role="main">
<div class="article-author-side"> <div class="article-author-side">
{% include _author-bio.html %} {% include _author-bio.html %}
</div> </div>
<div id="index"> <div id="index">
<h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3> <h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3>
{% for post in site.posts limit:5 %} {% for post in site.posts limit:5 %}
@ -45,6 +45,7 @@
</article> </article>
{% endfor %} {% endfor %}
</div><!-- /#index --> </div><!-- /#index -->
</div><!-- /#main -->
<div class="footer-wrap"> <div class="footer-wrap">
<footer> <footer>

2
_layouts/page.html
View File

@ -32,7 +32,7 @@
<div class="article-author-side"> <div class="article-author-side">
{% include _author-bio.html %} {% include _author-bio.html %}
</div> </div>
<article> <article class="page">
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>
<div class="article-wrap"> <div class="article-wrap">
{{ content }} {{ content }}

3
_layouts/post-index.html
View File

@ -28,10 +28,10 @@
</div><!-- /.image-wrap --> </div><!-- /.image-wrap -->
{% endif %} {% endif %}
<div id="main" role="main">
<div class="article-author-side"> <div class="article-author-side">
{% include _author-bio.html %} {% include _author-bio.html %}
</div> </div>
<div id="index"> <div id="index">
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>
{% for post in site.posts %} {% for post in site.posts %}
@ -54,6 +54,7 @@
</article> </article>
{% endfor %} {% endfor %}
</div><!-- /#index --> </div><!-- /#index -->
</div><!-- /#main -->
<div class="footer-wrap"> <div class="footer-wrap">
<footer> <footer>

2
_layouts/post.html
View File

@ -32,7 +32,7 @@
<div class="article-author-side"> <div class="article-author-side">
{% include _author-bio.html %} {% include _author-bio.html %}
</div> </div>
<article> <article class="post">
<div class="headline-wrap"> <div class="headline-wrap">
{% if page.link %} {% if page.link %}
<h1><a href="{{ page.link }}">{{ page.title }}</a></h1> <h1><a href="{{ page.link }}">{{ page.title }}</a></h1>

10
_sass/page.scss
View File

@ -5,7 +5,7 @@ body {
} }
.navigation-wrapper { .navigation-wrapper {
@include container; @include container;
padding: 2em 0 0; padding: 2em 0 1em;
font-family: $heading-font; font-family: $heading-font;
font-weight: 700; font-weight: 700;
text-transform: uppercase; text-transform: uppercase;
@ -206,8 +206,12 @@ $button-size: 1.5rem;
@include container; @include container;
@include clearfix; @include clearfix;
clear: both; clear: both;
margin-top: 1em; margin-top: 2em;
article { h1 {
margin-top: 0;
}
.post,
.page {
@include container; @include container;
@include grid(12,10); @include grid(12,10);
@include prefix(12,1); @include prefix(12,1);