26 files changed, 36 insertions(+), 25 deletions(-)

M _includes/seo.html
M _layouts/default.html
M _pages/home.md
M _pages/theme-setup.md
M _posts/2012-03-15-template-featured-image-external.md
M _posts/2012-03-15-template-featured-image-horizontal.md
M _posts/2012-03-15-template-featured-image-text-readability.md
M _posts/2012-03-15-template-featured-image-vertical.md
D images/sample-image-1.jpg
D images/sample-image-2.jpg
D images/sample-image-3.jpg
D images/sample-image-4.jpg
D images/sample-image-5.jpg
D images/sample-image-6.jpg
D images/sample-image-7.jpg
M images/site-logo.png
A images/unsplash-image-1.jpg
A images/unsplash-image-10.jpg
A images/unsplash-image-2.jpg
A images/unsplash-image-3.jpg
A images/unsplash-image-4.jpg
A images/unsplash-image-5.jpg
A images/unsplash-image-6.jpg
A images/unsplash-image-7.jpg
A images/unsplash-image-8.jpg
A images/unsplash-image-9.jpg

@@ 57,13 57,15 @@
   <meta name="twitter:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
   <meta name="twitter:description" content="{{ seo_description }}">
   <meta name="twitter:url" content="{{ canonical_url }}">
-  
-  {% if page.image.feature %}
+
+  {% if page.header.image %}
     <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:image" content="{{ page.image.feature | prepend: "/images/" | prepend: absurl }}">
+    <meta name="twitter:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: absurl }}{% endif %}">
   {% else %}
     <meta name="twitter:card" content="summary">
-    <meta name="twitter:image" content="{% if page.image.thumb %}{{ page.image.thumb | prepend: "/images/" | prepend: absurl }}{% else %}{{ site.logo | prepend: "/images/" | prepend: absurl }}{% endif %}">
+    {% if site.logo %}
+      <meta name="twitter:image" content="{{ site.logo | prepend: "/images/" | prepend: absurl }}">
+    {% endif %}
   {% endif %}
 
   {% if seo_author_twitter %}


@@ 81,8 83,8 @@
   {% endif %}
 {% endif %}
 
-{% if page.image.feature %}
-  <meta property="og:image" content="{{ page.image.feature | prepend: "/images/" | prepend: absurl }}">
+{% if page.header.image %}
+  <meta property="og:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: absurl }}{% endif %}">
 {% endif %}
 
 {% if page.date %}

@@ 15,18 15,17 @@ layout: compress
   {% include browser-upgrade.html %}
   {% include navigation.html %}
 
-  {% if page.image.feature %}
+  {% if page.header.image %}
     <div class="image-wrap">
     <img src=
-      {% if page.image.feature contains "http" %}
-        "{{ page.image.feature }}"
+      {% if page.header.image contains "http" %}
+        "{{ page.header.image }}"
       {% else %}
-        "{{ page.image.feature | prepend: "/images/" | prepend: absurl }}"
-        "{{ page.image.feature | prepend: absurl }}"
+        "{{ page.header.image | prepend: "/images/" | prepend: absurl }}"
       {% endif %}
       alt="{{ page.title }}">
-    {% if page.image.credit %}
-      <span class="image-credit">Photo Credit: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></span>
+    {% if page.header.credit %}
+      <span class="image-credit">Photo Credit: <a href="{{ page.header.credit.url }}">{{ page.header.credit.caption }}</a></span>
     {% endif %}
     </div><!-- /.image-wrap -->
   {% endif %}

@@ 2,8 2,9 @@
 layout: home
 permalink: /
 excerpt: "A minimal Jekyll theme for your blog by designer Michael Rose."
-image:
-  feature: sample-image-1.jpg
-  credit: WeGraphics
-  creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
+header:
+  image: unsplash-image-7.jpg
+  credit:
+    caption: Unsplash
+    url: https://unsplash.com
 ---=
\ No newline at end of file

@@ 6,10 6,6 @@ modified: 2016-01-19
 excerpt: "Instructions on how to install and customize the Jekyll theme Minimal Mistakes."
 share: true
 comments: true
-image:
-  feature: sample-image-3.jpg
-  credit: WeGraphics
-  creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
 ---
 
 {% include toc.html %}

@@ 1,6 1,8 @@
 ---
 title: "Template: Featured Image (External URL)"
 date: 2012-03-15T15:15:12+00:00
+header:
+  image: https://farm5.staticflickr.com/4140/4939863887_84705982fd_b.jpg
 categories:
   - Template
   - Uncategorized

@@ 1,6 1,11 @@
 ---
 title: "Template: Featured Image (Horizontal)"
 date: 2012-03-15T15:15:12+00:00
+header:
+  image: unsplash-image-1.jpg
+  credit:
+    caption: Unsplash
+    url: https://unsplash.com
 categories:
   - Template
   - Uncategorized

@@ 1,13 1,14 @@
 ---
 title: "Template: Featured Image And Text Readability"
+header:
+  image: unsplash-image-4.jpg
+  credit:
+    caption: Unsplash
+    url: https://unsplash.com
 tags: 
   - sample post
   - readability
   - test
-image:
-  feature: sample-image-4.jpg
-  credit: WeGraphics
-  creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
 ---
 
 This is a sample post with a large feature image[^1] up top and tons of text. Odio ad blue bottle vinyl, 90's narwhal commodo bitters pour-over nostrud. Ugh est hashtag in, fingerstache adipisicing laboris esse Pinterest shabby chic Portland. Shoreditch bicycle rights anim, flexitarian laboris put a bird on it vinyl cupidatat narwhal. Hashtag artisan skateboard, flannel Bushwick nesciunt salvia aute fixie do plaid post-ironic dolor McSweeney's. Cliche pour-over chambray nulla four loko skateboard sapiente hashtag.

@@ 1,6 1,11 @@
 ---
 title: "Template: Featured Image (Vertical)"
 date: 2012-03-15T15:36:32+00:00
+header:
+  image: unsplash-image-6.jpg
+  credit:
+    caption: Unsplash
+    url: https://unsplash.com
 categories:
   - Template
   - Uncategorized