From 99d4eee5bb7d1f33ba13b2dd7cc0b55811517a5a Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Tue, 30 Sep 2014 16:07:20 -0400
Subject: [PATCH] Wrap all page content in #main div to fix #86 - Adjust
 article styles to correctly display post indexes - Remove top margin from
 page titles

---
 _layouts/home.html       | 35 +++++++++++++--------------
 _layouts/page.html       |  2 +-
 _layouts/post-index.html | 51 ++++++++++++++++++++--------------------
 _layouts/post.html       |  2 +-
 _sass/page.scss          | 10 +++++---
 5 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/_layouts/home.html b/_layouts/home.html
index 3b3162b..5fe3ec7 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -28,23 +28,24 @@
   </div><!-- /.image-wrap -->
 {% endif %}
 
-<div class="article-author-side">
-  {% include _author-bio.html %}
-</div>
-
-<div id="index">
-  <h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3>
-  {% for post in site.posts limit:5 %}    
-  <article>
-    {% if post.link %}
-      <h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></h2>
-    {% else %}
-      <h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
-      <p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
-    {% endif %}
-  </article>
-  {% endfor %}
-</div><!-- /#index -->
+<div id="main" role="main"> 
+  <div class="article-author-side">
+    {% include _author-bio.html %}
+  </div>
+  <div id="index">
+    <h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3>
+    {% for post in site.posts limit:5 %}    
+    <article>
+      {% if post.link %}
+        <h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></h2>
+      {% else %}
+        <h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
+        <p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
+      {% endif %}
+    </article>
+    {% endfor %}
+  </div><!-- /#index -->
+</div><!-- /#main -->
 
 <div class="footer-wrap">
   <footer>
diff --git a/_layouts/page.html b/_layouts/page.html
index 4f3907b..0a41223 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -32,7 +32,7 @@
   <div class="article-author-side">
     {% include _author-bio.html %}
   </div>
-  <article>
+  <article class="page">
     <h1>{{ page.title }}</h1>
     <div class="article-wrap">
       {{ content }}
diff --git a/_layouts/post-index.html b/_layouts/post-index.html
index 381a414..380b8ad 100644
--- a/_layouts/post-index.html
+++ b/_layouts/post-index.html
@@ -28,32 +28,33 @@
   </div><!-- /.image-wrap -->
 {% endif %}
 
-<div class="article-author-side">
-  {% include _author-bio.html %}
-</div>
-
-<div id="index">
-  <h1>{{ page.title }}</h1>
-  {% for post in site.posts %}  
-  {% unless post.next %}
-    <h3>{{ post.date | date: '%Y' }}</h3>
-    {% else %}
-      {% capture year %}{{ post.date | date: '%Y' }}{% endcapture %}
-      {% capture nyear %}{{ post.next.date | date: '%Y' }}{% endcapture %}
-      {% if year != nyear %}
-        <h3>{{ post.date | date: '%Y' }}</h3>
-      {% endif %}
-    {% endunless %}
-    <article>
-      {% if post.link %}
-        <h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></h2>
+<div id="main" role="main">
+  <div class="article-author-side">
+    {% include _author-bio.html %}
+  </div>
+  <div id="index">
+    <h1>{{ page.title }}</h1>
+    {% for post in site.posts %}  
+    {% unless post.next %}
+      <h3>{{ post.date | date: '%Y' }}</h3>
       {% else %}
-        <h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
-        <p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
-      {% endif %}
-    </article>
-  {% endfor %}
-</div><!-- /#index -->
+        {% capture year %}{{ post.date | date: '%Y' }}{% endcapture %}
+        {% capture nyear %}{{ post.next.date | date: '%Y' }}{% endcapture %}
+        {% if year != nyear %}
+          <h3>{{ post.date | date: '%Y' }}</h3>
+        {% endif %}
+      {% endunless %}
+      <article>
+        {% if post.link %}
+          <h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></h2>
+        {% else %}
+          <h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h2>
+          <p>{{ post.excerpt | strip_html | truncate: 160 }}</p>
+        {% endif %}
+      </article>
+    {% endfor %}
+  </div><!-- /#index -->
+</div><!-- /#main -->
 
 <div class="footer-wrap">
   <footer>
diff --git a/_layouts/post.html b/_layouts/post.html
index 0f4ef37..76ac6ec 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -32,7 +32,7 @@
   <div class="article-author-side">
     {% include _author-bio.html %}
   </div>
-  <article>
+  <article class="post">
     <div class="headline-wrap">
       {% if page.link %}
         <h1><a href="{{ page.link }}">{{ page.title }}</a></h1>
diff --git a/_sass/page.scss b/_sass/page.scss
index b319040..d36baf7 100644
--- a/_sass/page.scss
+++ b/_sass/page.scss
@@ -5,7 +5,7 @@ body {
 }
 .navigation-wrapper {
 	@include container;
-	padding: 2em 0 0;
+	padding: 2em 0 1em;
 	font-family: $heading-font;
 	font-weight: 700;
 	text-transform: uppercase;
@@ -206,8 +206,12 @@ $button-size: 1.5rem;
 	@include container;
 	@include clearfix;
 	clear: both;
-	margin-top: 1em;
-	article {
+	margin-top: 2em;
+	h1 {
+		margin-top: 0;
+	}
+	.post,
+	.page {
 		@include container;
 		@include grid(12,10);
 		@include prefix(12,1);
-- 
2.43.0