From 54c5d4b093f1baf2d1e012d5d5444c575cbfbb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20=C2=BBmo=2E=C2=AB=20Sauer?= <kontakt@phlow.net>
Date: Tue, 16 Sep 2014 16:40:11 +0200
Subject: [PATCH] Update New Homepage

---
 _config.yml                                   | 16 +++----
 _includes/_about.html                         |  6 ---
 _includes/_site_description.html              |  1 -
 _includes/blog-entries.html                   |  6 +++
 _includes/footer.html                         |  2 +-
 _includes/footer_scripte.html                 |  2 +-
 _includes/for-loop-title-only-counter.html    | 10 ----
 _includes/for-loop-title-only.html            |  8 ----
 _includes/header.html                         |  5 +-
 ...{2014-09-11-page.md => 2014-08-11-page.md} |  0
 ...lwidth.md => 2014-08-19-page-fullwidth.md} |  4 +-
 _posts/design/2014-09-16-typography.md        |  1 +
 index.html                                    | 48 +++++++++++++++++--
 13 files changed, 65 insertions(+), 44 deletions(-)
 delete mode 100644 _includes/_about.html
 delete mode 100644 _includes/_site_description.html
 create mode 100644 _includes/blog-entries.html
 delete mode 100644 _includes/for-loop-title-only-counter.html
 delete mode 100644 _includes/for-loop-title-only.html
 rename _posts/design/{2014-09-11-page.md => 2014-08-11-page.md} (100%)
 rename _posts/design/{2014-08-17-page-fullwidth.md => 2014-08-19-page-fullwidth.md} (96%)

diff --git a/_config.yml b/_config.yml
index 3f2db90..7601ebf 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,13 +15,18 @@ title: "Feeling Responsive"
 slogan: "A Responsive Theme for Jekyll"
 
 
-# The description is used on homepage and important for search engine optimization
-description: "Feeling Responsive is built on the fabulous Foundation Framework and comes with lots of features to show your content right."
+# The description is used on homepage and in the footer to quickly describe your website. Use a maximum of 150 characters for SEO-purposes.
+description: "»Feeling Responsive« is a responsive theme for Jekyll based on the fabulous foundation framework with beautiful typography and a bright color palette."
+
+
+# This is a switch to easily change the {{ site.url }}-variable to develop the theme locally
+# - url: "http://localhost:4000"
+url: "http://phlow.github.io/feeling-responsive"
+baseurl: ""
 
 
 # Logo size is 600x80 pixels
 logo: "logo.png"
-baseurl: ""
 
 
 # Paginates all X entries
@@ -32,11 +37,6 @@ paginate: 5
 paginate_path: "blog/page:num"
 
 
-# This is a switch to easily change the {{ site.url }}-variable to develop the theme locally
-# - url: "http://localhost:4000"
-url: "http://phlow.github.io/feeling-responsive"
-
-
 # Theme works best with Kramdown (using the table of contents function)
 markdown: kramdown
 permalink: /:categories/:title/
diff --git a/_includes/_about.html b/_includes/_about.html
deleted file mode 100644
index 851e52a..0000000
--- a/_includes/_about.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2>Why use this theme?</h2>
-
-<p>
-	<em>Feeling Responsive</em> is heavily built on <a href="http://foundation.zurb.com/">Foundation</a>, the fabulous responsive webdesign framework by Zurb. It supports a 12-column grid, persuades you with beautiful <a href="{{ site.url }}/design/typography/">typography</a> and is heavily optimized for speed.
-</p>
-
diff --git a/_includes/_site_description.html b/_includes/_site_description.html
deleted file mode 100644
index 4688838..0000000
--- a/_includes/_site_description.html
+++ /dev/null
@@ -1 +0,0 @@
-»Feeling Responsive« is a responsive theme based on the fantastic foundation framework with beautiful typography and a bright color palette.
\ No newline at end of file
diff --git a/_includes/blog-entries.html b/_includes/blog-entries.html
new file mode 100644
index 0000000..bdb6372
--- /dev/null
+++ b/_includes/blog-entries.html
@@ -0,0 +1,6 @@
+		<ul class="side-nav">
+			{% for post in site.posts limit:include.entries offset:include.offset %}
+				<li><a href="{{ site.url }}{{ post.url }}">{% if post.subheadline %}{{ post.subheadline }} &middot; {% endif %}<strong>{{ post.title }}</strong></a></li>
+			{% endfor %}
+				<li class="text-right"><a href="{{ site.url }}/blog/"><strong>More ›</strong></a></li>
+		</ul>
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index 0491223..11d6a49 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,7 +5,7 @@
 						<h5 class="shadow-black">About this Website</h5>
 
 						<p class="shadow-black">
-							{% include _site_description.html %}
+							{{ site.description }}
 						</p>
 					</div><!-- /.large-6.columns -->
 
diff --git a/_includes/footer_scripte.html b/_includes/footer_scripte.html
index b278753..1b3142b 100644
--- a/_includes/footer_scripte.html
+++ b/_includes/footer_scripte.html
@@ -1,4 +1,4 @@
-  <script src="{{ site.url }}/assets/js/app.min.js"></script>
+<script src="{{ site.url }}/assets/js/app.min.js"></script>
 
 <script>
     $("#masthead").backstretch("{{ site.url }}/assets/img/{% if page.image.header %}{{ page.image.header }}{% else %}unsplash_3.jpg{% endif %}");
diff --git a/_includes/for-loop-title-only-counter.html b/_includes/for-loop-title-only-counter.html
deleted file mode 100644
index cbe346e..0000000
--- a/_includes/for-loop-title-only-counter.html
+++ /dev/null
@@ -1,10 +0,0 @@
-		<ul class="side-nav">
-			{% assign counter = 1 %}
-			{% for post in site.posts reversed %}
-				{% if post.categories contains include.list-category %}
-				<li><a href="{{ site.url }}{{ post.url }}">#{{ counter }} {{ post.title }}</a></li>
-				{% assign counter=counter | plus:1 %} 
-				{% endif %}
-			{% endfor %}
-				<li>&nbsp;</li>
-		</ul>
\ No newline at end of file
diff --git a/_includes/for-loop-title-only.html b/_includes/for-loop-title-only.html
deleted file mode 100644
index 31b7113..0000000
--- a/_includes/for-loop-title-only.html
+++ /dev/null
@@ -1,8 +0,0 @@
-		<ul class="side-nav">
-			{% for post in site.posts reversed %}
-				{% if post.categories contains include.list-category %}
-				<li><a href="{{ site.url }}{{ post.url }}">{% if post.chapter != nil %}{{ post.chapter }}. {% endif %}{{ post.title }}</a></li>
-				{% endif %}
-			{% endfor %}
-				<li>&nbsp;</li>
-		</ul>
\ No newline at end of file
diff --git a/_includes/header.html b/_includes/header.html
index 890cf0b..76569e4 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -9,7 +9,8 @@
 	<link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic%7cVolkhov:400,700' rel='stylesheet' type='text/css'>
 	{% if site.google_site_verification %}<meta name="google-site-verification" content="{{ site.google_site_verification}}" />{% endif %}
 	{% if site.bing_webmastertools_id %}<meta name="msvalidate.01" content="{{ site.bing_webmastertools_id }}" />{% endif %}
-	{% if page.meta_description %}<meta name="description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.description %}<meta name="description" content="{{ page.description | strip_html | escape }}"/>{% endif %}
+	{% if page.meta_description %}<meta name="description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.description %}<meta name="description" content="{{ page.description | strip_html | escape }}"/>{% elsif site.description %}<meta name="description" content="{{ site.description | strip_html | escape }}"/>{% endif %}
+	
 	{% if site.google_author %}<link rel="author" href="{{ site.google_author }}"/>{% endif %}
 	{% if site.favicon %}<link rel="shortcut icon" href="{{ site.url }}{{ site.favicon }}" type="image/png" />{% endif %}
 	{% if site.favicon %}<link rel="icon" href="{{ site.url }}{{ site.favicon }}" type="image/png" />{% endif %}
@@ -23,7 +24,7 @@
 	<meta property="og:locale" content="{% if site.og_locale == nil %}en_EN{% else %}{{ site.og_locale }}{% endif %}" />
 	{% if site.og_type %}<meta property="og:type" content="website" />{% endif %}
 	<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}" />
-	{% if page.meta_description %}<meta property="og:description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.description %}<meta name="description" content="{{ page.description | strip_html | escape }}"/>{% elsif site.description %}<meta name="description" content="{{ site.description | strip_html | escape }}"/>{% endif %}
+	{% if page.meta_description %}<meta property="og:description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.description %}<meta property="og:description" content="{{ page.description | strip_html | escape }}"/>{% elsif site.description %}<meta property="og:description" content="{{ site.description | strip_html | escape }}"/>{% endif %}
 	<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
 	{% if site.title %}<meta property="og:site_name" content="{{ site.title }}" />{% endif %}
 	{% if page.image.thumb %}<meta property="og:image" content="{{ site.url }}/assets/img/{{ page.image.thumb }}" />{% endif %}
diff --git a/_posts/design/2014-09-11-page.md b/_posts/design/2014-08-11-page.md
similarity index 100%
rename from _posts/design/2014-09-11-page.md
rename to _posts/design/2014-08-11-page.md
diff --git a/_posts/design/2014-08-17-page-fullwidth.md b/_posts/design/2014-08-19-page-fullwidth.md
similarity index 96%
rename from _posts/design/2014-08-17-page-fullwidth.md
rename to _posts/design/2014-08-19-page-fullwidth.md
index 6816a73..10ff633 100644
--- a/_posts/design/2014-08-17-page-fullwidth.md
+++ b/_posts/design/2014-08-19-page-fullwidth.md
@@ -1,9 +1,8 @@
 ---
 layout: page-fullwidth
-title:  "Full-Width Page"
+title:  "The Full-Width Page Template"
 subheadline:  "Multi-Device Layouts"
 description: "The full-width page format gives you all the space you need to show your content using the grid."
-date:  2014-07-05 07:00:00
 categories:
     - design
 image:
@@ -12,7 +11,6 @@ image:
 *Feeling Responsive* is built on Foundation. And of course, we make use of the wonderful grid system and so can you. Find out more about [constructing  beautiful layouts][1] in the foundation documentation.
 
 <div class="row">
-
     <div class="medium-4 columns top-30">
     <img src="{{ site.url }}/assets/img/unsplash_1.jpg" alt="">
     </div><!-- /.medium-4.columns -->
diff --git a/_posts/design/2014-09-16-typography.md b/_posts/design/2014-09-16-typography.md
index 640b8b3..ccd31f0 100644
--- a/_posts/design/2014-09-16-typography.md
+++ b/_posts/design/2014-09-16-typography.md
@@ -6,6 +6,7 @@ meta_description: "Feeling Responsive uses Volkhov for headlines, Lato for every
 description: "<em>Feeling Responsive</em> uses Volkhov for headlines, Lato for everything else and if you are in need to show some code, it will be in Lucida Console."
 image:
     header: "no"
+    thumb: "unsplash_7_thumb.jpg"
 categories:
     - design
 ---
diff --git a/index.html b/index.html
index 759f84f..04762c0 100644
--- a/index.html
+++ b/index.html
@@ -12,17 +12,16 @@ image:
 </div><!-- /#header-home -->
 
 
-
 <div class="row top-30">
 
     <div class="medium-4 columns">
-    	<a href="{{ site.url }}/portfolio/"><img src="{{ site.url }}/assets/img/unsplash_1-303x182.jpg" alt=""></a>
+    	<a href="{{ site.url }}/design/portfolio/"><img src="{{ site.url }}/assets/img/unsplash_1-303x182.jpg" alt=""></a>
         <h2>Portfolio</h2>
     	<p>
     		<em>Feeling Responsive</em> supports you with layouts to present your favorite and actual work. With the gallery- and portfolio-template you can show off your work as a designer, programmer, photographer or artist.
     	</p>
 
-        <p><a class="button tiny radius" href="{{ site.url }}/portfolio/">More ›</a></p>
+        <p><a class="button tiny radius" href="{{ site.url }}/design/portfolio/">More ›</a></p>
 
     </div><!-- /.medium-4.columns -->
 
@@ -30,7 +29,11 @@ image:
     <div class="medium-4 columns">
     	<a href="{{ site.url }}/about/"><img src="{{ site.url }}/assets/img/unsplash_8-303x182.jpg" alt=""></a>
         
-        {% include _about.html %}
+        <h2>Why use this theme?</h2>
+
+        <p>
+            <em>Feeling Responsive</em> is heavily built on <a href="http://foundation.zurb.com/">Foundation</a>, the fabulous responsive webdesign framework by Zurb. It supports a 12-column grid, persuades you with beautiful <a href="{{ site.url }}/design/typography/">typography</a> and is heavily optimized for speed.
+        </p>
 
         <p><a class="button tiny radius" href="{{ site.url }}/about/">More ›</a></p>
     </div><!-- /.medium-4.columns -->
@@ -48,3 +51,40 @@ image:
     </div><!-- /.medium-4.columns -->
 
 </div><!-- /.row -->
+
+
+<div class="row top-60">
+    <div class="small-12 columns">
+        <h2>New Blog Articles</h2>
+    </div><!-- /.small-12.columns -->
+</div><!-- /.row -->
+
+
+
+
+
+
+<div id="blog-index" class="row">
+    <div class="medium-6 columns">
+        {% for post in site.posts limit:1 %}
+            <p class="subheadline">{% if post.subheadline %}{{ post.subheadline }}{% endif %}<span class="subheader"><small> {% if post.categories %}{{ post.categories | join: ' &middot; ' }}{% endif %}</small></span></p>
+            <h2><a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></h2>
+
+            <p>
+            {% if post.image.thumb %}<a href="{{ site.url }}{{ post.url }}" title="{{ post.title escape_once }}"><img src="{{ site.url }}/assets/img/{{ post.image.thumb }}" class="alignleft" width="120" height="120" alt="{{ page.title escape_once }}"></a>{% endif %}
+
+            {% if post.meta_description %}{{ post.meta_description | strip_html | escape }}{% elsif post.description %}{{ post.description | strip_html | escape }}{% endif %}
+
+            <a href="{{ site.url }}{{ post.url }}" title="Read {{ post.title escape_once }}"><strong>Read more ›</strong></a>
+            </p>
+            
+        {% endfor %}
+    </div><!-- /.medium-5.columns -->
+
+
+    <div class="medium-6 columns">
+        <p><strong>More Articles</strong></p>
+        {% include blog-entries.html entries='3' offset='1' %}
+    </div><!-- /.medium-7.columns -->
+</div><!-- /.row -->
+