Wrap all page content in #main div to fix #86
- Adjust article styles to correctly display post indexes - Remove top margin from page titles
This commit is contained in:
parent
1a837bbdb5
commit
99d4eee5bb
5 changed files with 53 additions and 47 deletions
|
@ -28,11 +28,11 @@
|
||||||
</div><!-- /.image-wrap -->
|
</div><!-- /.image-wrap -->
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="article-author-side">
|
<div id="main" role="main">
|
||||||
|
<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 %}
|
||||||
<article>
|
<article>
|
||||||
|
@ -44,7 +44,8 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</article>
|
</article>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div><!-- /#index -->
|
</div><!-- /#index -->
|
||||||
|
</div><!-- /#main -->
|
||||||
|
|
||||||
<div class="footer-wrap">
|
<div class="footer-wrap">
|
||||||
<footer>
|
<footer>
|
||||||
|
|
|
@ -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 }}
|
||||||
|
|
|
@ -28,11 +28,11 @@
|
||||||
</div><!-- /.image-wrap -->
|
</div><!-- /.image-wrap -->
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="article-author-side">
|
<div id="main" role="main">
|
||||||
|
<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 %}
|
||||||
{% unless post.next %}
|
{% unless post.next %}
|
||||||
|
@ -53,7 +53,8 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</article>
|
</article>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div><!-- /#index -->
|
</div><!-- /#index -->
|
||||||
|
</div><!-- /#main -->
|
||||||
|
|
||||||
<div class="footer-wrap">
|
<div class="footer-wrap">
|
||||||
<footer>
|
<footer>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue