Organized Theme › new include-folder called helper, corrected typography

Phlow · Nov 25, 2016 · 6738560 · 6738560
1 parent d91e042
commit 6738560
Show file tree

Hide file tree

Showing 29 changed files with 58 additions and 136 deletions.
diff --git a/_config.yml b/_config.yml
@@ -96,10 +96,10 @@ font:
 #  import: 'Gentium+Basic:400,400italic,700,700italic'
 #  import: 'Fira+Sans:400,400italic,700,700italic|Fira+Mono'
   font-family-serif:      'Georgia, "Times New Roman", serif;'
-  font-family-sans-serif: '"Source Sans", "Neue Helvetica", Arial, serif;'
-  base-font-family:       '"Source Sans", "Neue Helvetica", Arial, serif;'
+  font-family-sans-serif: '"Source Sans Pro", "Neue Helvetica", Arial, serif;'
+  base-font-family:       '"Source Sans Pro", "Neue Helvetica", Arial, serif;'
   font-family-monospace:  '"Source Code Pro", "Courier New", Monaco, monospace;'
-  header-font-family:     '"Source Sans", "Neue Helvetica", Arial, serif;'
+  header-font-family:     '"Source Sans Pro", "Neue Helvetica", Arial, serif;'
 
 
 #      ______

diff --git a/_config_dev.yml b/_config_dev.yml
@@ -6,7 +6,7 @@
 # Start development with › $ jekyll serve --config _config.yml,_config_dev.yml
 
 # url: 		'http://localhost:4000'
-# baseurl: 	''
+baseurl: 	''
 
 # See › https://github.com/jekyll/jekyll-gist#disabling-noscript-support
 gist:

diff --git a/_data/ui.yml b/_data/ui.yml
@@ -37,6 +37,15 @@ en: &DEFAULT_EN
   subscribe_to_my_rss_feed      : 'Subscribe to my RSS Feed'
   source                        : 'Source'
   check_out_link                : 'Check out the link ›'
+  enter_search_term             : 'Enter search term and hit enter'
+  search_results                : 'Search Results'
+  search                        : 'Search ›'
+  search_input_placeholder      : 'Search [Hit Tab and start writing]'
+  try_404                       : 'Try…  '
+  no_problem_404                : 'No Problem!'
+  start_over_404                : '...to start over on the'
+  search_below_404              : '...to **search** below  '
+  search_404                    : 'Search'
 
 en-US:
   <<: *DEFAULT_EN

diff --git a/_includes/_share.html b/_includes/_share.html
diff --git a/_includes/_1_head.html → _includes/helper/_1_head.html b/_includes/_1_head.html → _includes/helper/_1_head.html
@@ -29,6 +29,8 @@
   <link rel="stylesheet" href="{{ url }}/assets/css/simplicity.css">
   <link rel="canonical" href="{{ url }}{{ page.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ url }}/feed.xml">
+  <link href='https://fonts.googleapis.com/css?family={{ site.font.import }}' rel='stylesheet' type='text/css'>
+
 
   <meta name="description" content="{{ description }}">
   <link type="text/plain" rel="author" href="{{ url }}/humans.txt">
@@ -58,7 +60,7 @@
   {% endif %}
 
 
-  {% include _favicon.html %}
+  {% include helper/_favicon.html %}
 
   {% unless page.style == NULL %}<style type="text/css">{{ page.style }}</style>{% endunless %}
 

diff --git a/_includes/_2_topbar_navigation.html → _includes/helper/_2_topbar_navigation.html b/_includes/_2_topbar_navigation.html → _includes/helper/_2_topbar_navigation.html
diff --git a/_includes/_3_masthead.html → _includes/helper/_3_masthead.html b/_includes/_3_masthead.html → _includes/helper/_3_masthead.html
diff --git a/_includes/_4_footer.html → _includes/helper/_4_footer.html b/_includes/_4_footer.html → _includes/helper/_4_footer.html
@@ -1,7 +1,7 @@
 <footer id="footer" class="row">
   <nav id="navigation-footer" class="small-12 columns">
     <ul class="inline-list">
-      {% include _social_media_icons.html %}
+      {% include helper/_social_media_icons.html %}
       {% for nav in site.data.navigation_footer %}
         {% if nav.url contains 'http' %}
           {% assign domain = '' %}

diff --git a/_includes/_5_footer_scripts.html → _includes/helper/_5_footer_scripts.html b/_includes/_5_footer_scripts.html → _includes/helper/_5_footer_scripts.html
diff --git a/_includes/_comments.html → _includes/helper/_comments.html b/_includes/_comments.html → _includes/helper/_comments.html
diff --git a/_includes/_favicon.html → _includes/helper/_favicon.html b/_includes/_favicon.html → _includes/helper/_favicon.html
diff --git a/_includes/_pagination.html → _includes/helper/_pagination.html b/_includes/_pagination.html → _includes/helper/_pagination.html
diff --git a/_includes/_social_media_icons.html → _includes/helper/_social_media_icons.html b/_includes/_social_media_icons.html → _includes/helper/_social_media_icons.html
diff --git a/_includes/_video_embed.html → _includes/helper/_video_embed.html b/_includes/_video_embed.html → _includes/helper/_video_embed.html
diff --git a/_includes/navigation.html → _includes/helper/navigation.html b/_includes/navigation.html → _includes/helper/navigation.html
diff --git a/_includes/sitemap_collection.xml b/_includes/sitemap_collection.xml
diff --git a/_layouts/archive.html b/_layouts/archive.html
@@ -1,36 +1,23 @@
 ---
-layout: compress
+layout: default
 format: archive
 ---
-{% include _1_head.html %}
-
-{% include _2_topbar_navigation.html %}
-
-{% include _3_masthead.html %}
-
 <div id="content" class="row">
-	<div class="medium-8 medium-centered columns">
+  <div class="medium-8 medium-centered columns">
 
-		<h1>{{ page.title }}</h1>
+    <h1>{{ page.title }}</h1>
 
-		{{ content }}
+    {{ content }}
 
-		<div class="bem2">
-			{% include search %}
-		</div>
+    <div class="bem2">
+      {% include search %}
+    </div>
 
-		<ul class="toc">
-		{% for post in site.posts %}
-			<li><a href="{{ post.url | absolute_url }}">{% if post.subheadline %}<span>{{ post.subheadline }}</span>{% endif %}{{ post.title }}</a></li>
-		{% endfor %}
-		</ul>
+    <ul class="toc">
+      {% for post in site.posts %}
+      <li><a href="{{ post.url | absolute_url }}">{% if post.subheadline %}<span>{{ post.subheadline }}</span>{% endif %}{{ post.title }}</a></li>
+      {% endfor %}
+    </ul>
 
-	</div>
+  </div>
 </div><!-- /.row -->
-
-{% include _4_footer.html %}
-
-{% include _5_footer_scripts.html %}
-
-</body>
-</html>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,17 +1,17 @@
 ---
 layout: compress
 ---
-{% include _1_head.html %}
+{% include helper/_1_head.html %}
 
-{% include _2_topbar_navigation.html %}
+{% include helper/_2_topbar_navigation.html %}
 
-{% include _3_masthead.html %}
+{% include helper/_3_masthead.html %}
 
 {{ content }}
 
-{% include _4_footer.html %}
+{% include helper/_4_footer.html %}
 
-{% include _5_footer_scripts.html %}
+{% include helper/_5_footer_scripts.html %}
 
 </body>
 </html>
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
@@ -1,17 +1,10 @@
 ---
-layout: compress
+layout: default
 format: frontpage
 ---
-{% include _1_head.html %}
-
-{% include _2_topbar_navigation.html %}
-
-{% include _3_masthead.html %}
-
 <main role="main" id="content" class="row">
     <div class="medium-8 medium-centered columns">
 
-
     {% for post in site.posts limit:site.posts_with_teaser_limit %}
 
             {% if post.video %}
@@ -88,10 +81,3 @@ <h2>{{ site.data.ui[site.lang].more_articles }}</h2>
         {{ content }}
     </div>
 </main><!-- /#content/.row -->
-
-{% include _4_footer.html %}
-
-{% include _5_footer_scripts.html %}
-
-</body>
-</html>
diff --git a/_layouts/introduction.html b/_layouts/introduction.html
@@ -1,13 +1,7 @@
 ---
-layout: compress
+layout: default
 format: introduction
 ---
-{% include _1_head.html %}
-
-{% include _2_topbar_navigation.html %}
-
-{% include _3_masthead.html %}
-
 <main role="main" id="content" class="row">
     <div class="small-5 medium-4 columns">
         {% if page.link %}
@@ -27,12 +21,4 @@
     <div class="introduction-text small-7 medium-7 end columns">
         {{ content }}
     </div>
-
 </main><!-- /#content/.row -->
-
-{% include _4_footer.html %}
-
-{% include _5_footer_scripts.html %}
-
-</body>
-</html>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -8,7 +8,7 @@
       <meta content="{{ site.data.ui[site.lang].html_language }}" itemprop="inLanguage" />
       <header>
 
-        {% include _video_embed.html %}
+        {% include helper/_video_embed.html %}
 
         {% if page.video or page.embed %}
         {% elsif page.image %}
@@ -52,7 +52,7 @@ <h1 itemprop="name headline">{{ page.title | remove: '<p>' | remove: '</p>' }}</
 
 
       {% if page.comments == true %}
-      {% include _comments.html %}
+      {% include helper/_comments.html %}
       {% endif %}
 
 
@@ -67,7 +67,7 @@ <h1 itemprop="name headline">{{ page.title | remove: '<p>' | remove: '</p>' }}</
       {% endif %}
 
 
-      {% include _pagination.html %}
+      {% include helper/_pagination.html %}
     </article>
   </div>
 </main><!-- /.row -->
diff --git a/_posts/2015-11-03-images-alignment.md b/_posts/2015-11-03-images-alignment.md
@@ -9,10 +9,10 @@ See how images align in your posts. To position them left, right or in the middl
 
 This is my gun, clyde! ever notice how sometimes you come across somebody you shouldn't have f!*ked with? well, i'm that guy. it's because i'm green isn't it! don't p!ss down my back and tell me it's raining. you want a guarantee, buy a toaster. dyin' ain't much of a livin', boy. what you have to ask yourself is, do i feel lucky. well do ya' punk? good morning, oh in case i don't see you, good afternoon, good evening and goodnight. dyin' ain't much of a livin', boy. when a naked man's chasing a woman through an alley with a butcher knife and a hard-on, i figure he's not out collecting for the red cross. well, do you have anything to say for yourself? i just heard about evans new position,good luck to you evan backstabber, bastard, i mean baxter.
 
-<a href="{{ "/" | absolute_url }}"><img class="right" src="{{ "/images/" | absolute_url }}death-to-stock-photography-wild-7-300x200.jpg" alt=""></a>
+<a href="{{ "/" | absolute_url }}"><img class="right" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=300%C3%97200&w=300&h=200" alt=""></a>
 Man's gotta know his limitations. look ma i'm road kill kinda hot in these rhinos. i just heard about evans new position,good luck to you evan backstabber, bastard, i mean baxter. we got no food we got no money and our pets heads are falling off! haaaaaaarry. here she comes to wreck the day. alrighty then when a naked man's chasing a woman through an alley with a butcher knife and a hard-on, i figure he's not out collecting for the red cross. this is the ak-47 assault rifle, the preferred weapon of your enemy; and it makes a distinctive sound when fired at you, so remember it. you want a guarantee, buy a toaster. are you feeling lucky punk this is my gun, clyde!
 
-<img class="left" src="{{ "/images/" | absolute_url }}death-to-stock-photography-wild-4.jpg" alt="">
+<img class="left" src="https://placeholdit.imgix.net/~text?txtsize=33&txt=300%C3%97600&w=300&h=600" alt="">
 Man's gotta know his limitations. don't p!ss down my back and tell me it's raining. we're going for a ride on the information super highway. you see, in this world there's two kinds of people, my friend: those with loaded guns and those who dig. you dig. alrighty then excuse me, i'd like to ass you a few questions. brain freeze. ever notice how sometimes you come across somebody you shouldn't have f**ked with? well, i'm that guy. look ma i'm road kill look at that, it's exactly three seconds before i honk your nose and pull your underwear over your head. what you have to ask yourself is, do i feel lucky. well do ya' punk? you see, in this world there's two kinds of people, my friend: those with loaded guns and those who dig. you dig.
 
 Look at that, it's exactly three seconds before i honk your nose and pull your underwear over your head. your entrance was good, his was better. here. put that in your report!" and "i may have found a way out of here. your entrance was good, his was better. hey, maybe i will give you a call sometime. your number still 911? we got no food we got no money and our pets heads are falling off! haaaaaaarry. well, do you have anything to say for yourself? it's because i'm green isn't it! here she comes to wreck the day. this is the ak-47 assault rifle, the preferred weapon of your enemy; and it makes a distinctive sound when fired at you, so remember it. hey, maybe i will give you a call sometime. your number still 911? kinda hot in these rhinos.

diff --git a/_posts/2015-11-25-post-with-image.md b/_posts/2015-11-25-post-with-image.md
@@ -1,16 +1,16 @@
 ---
-title: 'Post with Image and Caption'
-image: 'death-to-the-stock-photography-3457.jpg'
-caption: 'Death to Stock Photography'
-caption_url: 'http://deathtothestockphoto.com/'
+title           : 'Post with Image and Caption'
+image           : 'unsplash-samuel-scrimshaw.jpg'
+caption         : 'Samuel Scrimshaw'
+caption_url     : 'https://www.instagram.com/samscrim/'
 ---
 If you need a big image to open your post, add one line to front matter. *Simplicity* does the rest. If you want to add a caption, do it! The caption should link to the source of the photo? Add a link.
 <!--more-->
 {% highlight html %}
 ---
-title: Post with Image and Caption
-image: death-to-the-stock-photography-3457.jpg
-caption: Death to Stock Photography
-caption_url: http://deathtothestockphoto.com/
+title           : 'Post with Image and Caption'
+image           : 'unsplash-samuel-scrimshaw.jpg'
+caption         : 'Samuel Scrimshaw'
+caption_url     : 'https://www.instagram.com/samscrim/'
 ---
 {% endhighlight %}
diff --git a/images/death-to-stock-photography-wild-4.jpg b/images/death-to-stock-photography-wild-4.jpg
diff --git a/images/death-to-stock-photography-wild-7-300x200.jpg b/images/death-to-stock-photography-wild-7-300x200.jpg
diff --git a/images/death-to-the-stock-photography-3457.jpg b/images/death-to-the-stock-photography-3457.jpg
diff --git a/images/unsplash-samuel-scrimshaw.jpg b/images/unsplash-samuel-scrimshaw.jpg
diff --git a/pages/404.md b/pages/404.md
@@ -5,14 +5,13 @@ title: "Oops?!? This page is gone or moved or…"
 sitemap: false
 ---
 
-## No problem!
+## {{ site.data.ui[site.lang].no_problem_404 | default: "No Problem!" }}
 
-Try…  
-…to start over on the [home page]({{ "/" | absolute_url }})  
-…have a look into the [archive]({{ "/archive/" | absolute_url }})  
-…try search!
+{{ site.data.ui[site.lang].try_404 | default: "Try…  " }}
+{{ site.data.ui[site.lang].start_over_404 | default: "...to start over on the" }} [{{ site.data.ui[site.lang].home_page_404 | default: "home page" }}]({{ site.baseurl }}/).  
+{{ site.data.ui[site.lang].search_below_404 | default: "...to **search** below  " }} [{{ site.data.ui[site.lang].home_page_404 | default: "home page" }}]({{ site.baseurl }}/).  
+{{ site.data.ui[site.lang].if_you_404 | default: "…if you can't find it,  " }} [{{ site.data.ui[site.lang].ask_about_404 | default: "ask about it " }}]({{ site.baseurl }}/contact/).
 
-## Search
-
-{% include search %}
+### {{ site.data.ui[site.lang].search_404 | default: "Search" }}
 
+{% include search %}
diff --git a/pages/navigation.md b/pages/navigation.md
@@ -3,4 +3,4 @@ title: "Navigation"
 permalink: /navigation/
 show_meta: false
 ---
-{% include navigation.html %}
+{% include helper/navigation.html %}