type-on-strap 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68fbc05ebf76280282dac37718f941cbdce3c1b768a174f29222f3413178f751
-  data.tar.gz: a9fcbffee5c308eea9236780ac63a1a8212860f48f10f564cc2b78b743cc7a5d
+  metadata.gz: a82252f722dbaa499c9b88862b7bf015b4e9e433065626b0986db18f05330c3c
+  data.tar.gz: '049c3c0e3a27975140f120ad01305071d2aaf7449678ae0019df49dd9eb74bc3'
 SHA512:
-  metadata.gz: b79da2305dae68ec07ebabfd36b0382ef174c094ae9f0c1309605710c93cff79441f5346c73961825bceeb369d5e659b7825a19f8671fbaae91af946d2c38475
-  data.tar.gz: 3f66b7a9e236d652cc3ef1df4c0d2198cb4d557ce0c14624d9f8aeb927165996d83ef4f0ca00928fad52580fc31138efa6f5d823d7aa80791108c7074ec4ab37
+  metadata.gz: d965f661f21023b6146578872761576f861476a97109bf9e81d9d3e1afd28aa01691b72a3f86bef8ca47a47137d0718553f58c5bad707917e658516a95576701
+  data.tar.gz: 8d85707b6cdb8cb4c93bae5188b2c1bd6b4acaa7312785fec5fac7248f9ca543b09a78b99afd64ab1fa965619634ede40d74fdaba722f97681a28365c4ecf9b6

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Sylhare
+Copyright (c) 2016-2019 Sylhare
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -16,7 +16,7 @@ A free and open-source [Jekyll](https://jekyllrb.com) theme. Based on Rohan Chan
 * Syntax Highlighting: Easily customisable [Base16](https://github.com/chriskempson/base16)
 * Free of rights images from [pexels](https://www.pexels.com/)
 
-> [Demo](https://sylhare.github.io/Type-on-Strap/)
+> [Demo Site](https://sylhare.github.io/Type-on-Strap/)
  
 [![Default Type on Strap blog](https://github.com/Sylhare/Type-on-Strap/blob/master/screenshot.png?raw=true)](https://sylhare.github.io/Type-on-Strap/)
 
@@ -33,12 +33,18 @@ A free and open-source [Jekyll](https://jekyllrb.com) theme. Based on Rohan Chan
 
 ## Usage
 
+### As a ruby gem
+
+Check out this tutorial: [Use Type on strap as a gem](https://github.com/sylhare/Type-on-Strap/tree/v2#use-as-ruby-gem)
+
+### As a github page
+
 1. Fork and clone the [Type on Strap repo](https://github.com/sylhare/Type-On-Strap): `git clone https://github.com/Sylhare/Type-on-Strap.git`
 2. Install [Jekyll](https://jekyllrb.com/docs/installation/): `gem install jekyll`, check [#1](https://github.com/Sylhare/Type-on-Strap/issues/1) if you have a problem.
 3. Install the theme's dependencies: `bundle install`
 4. Customize the theme
 	- Github Page: [update `_config.yml`](https://github.com/Sylhare/Type-on-Strap#site-configuration)
-5. Run the Jekyll server: `jekyll serve`
+5. Run the Jekyll server: `bundle exec jekyll serve`
 
 ## Structure
 
@@ -63,7 +69,7 @@ jekyll-theme-basically-basic
 |   ├── gallery.md             # Gallery page for your photos
 |   ├── portfolio.md	       # Portfolio page for your projects
 |   ├── search.html	       # Search page
-|   └── tags.md         # The tag page
+|   └── tags.md                # The tag page
 ├── _config.yml                # sample configuration
 └── index.html                 # sample home page (blog page paginated)
 ```
@@ -81,15 +87,15 @@ Configure Jekyll as your own blog or with a subpath in in `_config.yml`:
 Jekyll website *without* a subpath (such as a GitHub Pages website for a given username):
 
 ```yml
-  baseurl: ""
-  url: "https://username.github.io"
+baseurl: ""
+url: "https://username.github.io"
 ```
 
 Jekyll website *with* subpath (like the Type on Strap [demo](https://sylhare.github.io/Type-on-Strap/) page):
 
 ```yml
-  baseurl: "/sub-directory"
-  url: "https://username.github.io/"
+baseurl: "/sub-directory"
+url: "https://username.github.io/"
 ```
 
 Please configure this  before using the theme.
@@ -102,70 +108,40 @@ and as meta properties for search engines, browsers, and the site's RSS feed.
 Change these variables in `_config.yml`:
 
 ```yml
-  theme_settings:
-    title: My Jekyll Blog                 # Name of website
-    avatar: assets/img/triangle.png       # Path of avatar image, to be displayed in the theme's header
-    description: My blog posts            # Short description, primarily used by search engines
+title: My Jekyll Blog                 # Name of website
+avatar: assets/img/triangle.png       # Path of avatar image, to be displayed in the theme's header
+description: My blog posts            # Short description, primarily used by search engines
+favicon: assets/favicon.ico           # Icon displayed in the tab
 ```
 
-### Customizing text
+### Main configuration
 
 #### Footer and Header's text
 
 Customize your site header/footer with these variables in `_config.yml`:
 
 ```yml
-  theme_settings:
-    header_text: Welcome to my Jekyll blog
-    header_feature_image: assets/img/sample3.png
-    footer_text: Copyright 2017
+header_text: Welcome to my Jekyll blog
+header_feature_image: assets/img/sample3.png
+footer_text: Copyright 2017
 ```
 
 If you don't want anything, replace the value by `" "`.
 
 #### Localisation string
 
-Change localization string variables in `_config.yml`.
-
-English text used in the theme has been grouped  so you can quickly translate the theme or change labels to suit your needs.
-
-```yml
-  theme_settings:
-     str_follow_on: "Follow on"
-     str_rss_follow: "Follow RSS feed"
-     str_email: "Email"
-     str_next_post: "Next post"
-     str_previous_post: "Previous post"
-     str_next_page: "Next"
-     str_previous_page: "Prev"
-     str_continue_reading: "Continue reading"
-     str_javascript_required_disqus: "Please enable JavaScript to view comments."
-```
-
-
-### Other features
-
-Jekyll works with [liquid](https://shopify.github.io/liquid/) tags usually represented by:
+Localization string is a way to quickly change the template language for text like *Next Post* or *Follow on*, ...
+You can find all the properties in `_data/language.yml`.
 
-```
-{{ liquid.tag | filter }}
-```
+By default it is in english, but you can easily add your own language.
 
-These are useful to render your jekyll files. 
-You can learn more about them on [shopify's doc](https://help.shopify.com/themes/liquid/basics)
-
-### Footer's icons
+### Google Analytics
 
-Display the site's icon from [Font Awesome](https://fortawesome.github.io/Font-Awesome/) in the footer. 
-All icon variables should be your username enclosed in quotes (e.g. "username") in `_config.yml`, 
-except for the following variables:
+To enable Google Analytics, add your [tracking ID](https://support.google.com/analytics/answer/1032385) 
+to `_config.yml` like so:
 
 ```yml
-  theme_settings:
-     rss: true                                                   # Make sure you created a feed.xml with feed.xml layout
-     email_address: type@example.com
-     linkedin: https://www.linkedin.com/in/FirstLast
-     stack_exchange: https://stackoverflow.com/users/0000/first-last
+google_analytics: UA-NNNNNNNN-N
 ```
 
 ### Comments (via Disqus)
@@ -177,18 +153,7 @@ To enable Disqus comments, add your [Disqus shortname](https://help.disqus.com/c
 to your project's `_config.yml` file:
 
 ```yml
-  theme_settings:
-     disqus_shortname: my_disqus_shortname
-```
-
-### Google Analytics
-
-To enable Google Analytics, add your [tracking ID](https://support.google.com/analytics/answer/1032385) 
-to `_config.yml` like so:
-
-```yml
-  theme_settings:
-     google_analytics: UA-NNNNNNNN-N
+disqus_shortname: my_disqus_shortname
 ```
 
 ### Math typesetting
@@ -196,8 +161,7 @@ to `_config.yml` like so:
 When KateX is set in `_config.yml`:
 
 ```yml
-  theme_settings:
-     katex: true # to Enable it
+katex: true # to Enable it
 ```
 
 You can then wrap math expressions with `$$` signs in your posts and make sure you have set the `katex` variable 
@@ -217,30 +181,38 @@ $$
 $$
 ```
 
-### Post excerpt
+### Social icons
 
-The [excerpt](https://jekyllrb.com/docs/posts/#post-excerpts) are the first lines of an article that is display on the blog page. 
-The length of the excerpt has a default of around `250` characters and can be manually set in the post using:
+In `_data/social.yml` you can customize the social icons from other wbesite you wish to display in the blog.
+The site icons come from [Font Awesome](https://fortawesome.github.io/Font-Awesome/).
 
-```yml
----
-layout: post
-title: Sample Page
-excerpt_separator: <!--more-->
----
+#### Share in article
 
-some text in the excerpt
-<!--more-->
-... rest of the text not shown in the excerpt ...
+The share icons are the one at the bottom of the blog page if enabled, 
+to share the article on those platform.
+
+
+#### Footer
+
+Display  in the footer. 
+All icon variables should be your username enclosed in quotes (e.g. "username") in `_config.yml`, 
+except for the following variables:
+
+```yml
+rss: true                                                   # Make sure you created a feed.xml with feed.xml layout
+email_address: type@example.com
+linkedin: https://www.linkedin.com/in/FirstLast
+stack_exchange: https://stackexchangecom/users/0000/first-last
+stack_overflow: https://stackoverflow.com/users/0000/first-last
 ```
 
-The html is stripped out of the excerpt so it only display text.
+### Customizing Posts
 
-## Layout
-Please refer to the [Jekyll docs for writing posts](https://jekyllrb.com/docs/posts/). 
-Non-standard features are documented below.
+When writing a post, be sure in jekyll to:
+ - Put it in the `_posts` folder
+ - Name it with the date first like `2019-08-21-This-is-my-blog-post.md`
 
-### Layout: Post
+#### Layout: Post
 
 This are the basic features you can use with the  `post` layout.
 
@@ -258,14 +230,37 @@ tags: [sample, markdown, html]
 ```
 
 With `thumbnail`, you can add a smaller image than the `feature-img`. 
-If you don't want/have a thumbnail you can still use the same image as the feature one.
+If you don't have a thumbnail you can still use the same image as the feature one.
 
 The background used when `color` is set comes from `lineart.png` from [xukimseven](https://github.com/xukimseven) 
-you can edit it in the config file (`theme_settings > color_image`). If you want another one, put it in `/assets/img` as well. 
+you can edit it in the config file (`_config.yml > color_image`). If you want another one, put it in `/assets/img` as well. 
 
 The **bootstrap** is not mandatory and is only useful if you want to add bootstrapped content in your page. 
 It will respect the page and theme layout, mind the padding on the sides.
 
+#### Post excerpt
+
+The [excerpt](https://jekyllrb.com/docs/posts/#post-excerpts) are the first lines of an article that is display on the blog page. 
+The length of the excerpt has a default of around `250` characters and can be manually set in the post using:
+
+```yml
+---
+layout: post
+title: Sample Page
+excerpt_separator: <!--more-->
+---
+
+some text in the excerpt
+<!--more-->
+... rest of the text not shown in the excerpt ...
+```
+
+The html is stripped out of the excerpt so it only display text.
+
+## Other Layouts
+Please refer to the [Jekyll docs for writing posts](https://jekyllrb.com/docs/posts/). 
+Non-standard features are documented below.
+
 ### Layout: Page
 
 The page layout have a bit more features explained here.
@@ -335,6 +330,21 @@ date: 2019-07-25		 	       # Not mandatory, however needs to be in date format t
 ---
 ```
 
+#### Portfolio in gem
+
+Make sure your `_config.yml` contains the following if you are using the theme as a gem:
+
+```yml
+
+# PORTFOLIO
+collections:
+  portfolio:
+    output: true
+    permalink: /:collection/:name
+```    
+
+This creates the collection for Jekyll so it can find and display your portfolio posts.
+
 ### Gallery
 
 You can create a gallery using [Masonry JS](https://masonry.desandro.com/) which will placing the pictures in optimal position 
@@ -390,21 +400,18 @@ tags: [sample, markdown, html]
 All the tags will be listed in `tags.html` with a link toward the pages or posts.
 The Tag page can be hidden with the `hide` option. You can remove the icon by removing `icon` (like for the search page).
 
-## Template as a Gem
+## Advanced
 
-You can use Type-on-strap as a [gem](https://rubygems.org/gems/type-on-strap). 
-Checkout an example in the [gem-demo branch](https://github.com/Sylhare/Type-on-Strap/tree/gem-demo).
-To make the feature pages available in from the gem I created them as layouts that can be invoked in the pages folder.
+### Liquid tags
 
-So if you're using the template as a theme, Make sure you have:
-  - A `index.html` file
-  - The right `_config.yml` with the theme setting such as `theme: type-on-strap` uncommented
-  - The feature page included. (ex: as it is already in `pages`)
-  - Some content ready in `_posts` and `_portfolio` to be displayed
+Jekyll works with [liquid](https://shopify.github.io/liquid/) tags usually represented by:
 
-Now you can use any theme gem with github pages : [29/11/2017 Github Pages Broadcast](https://github.com/blog/2464-use-any-theme-with-github-pages)
+```
+{{ liquid.tag | filter }}
+```
 
-## Advanced
+These are useful to render your jekyll files. 
+You can learn more about them on [shopify's doc](https://help.shopify.com/themes/liquid/basics)
 
 ### Minimizing and optimizing: css, js and images
 
@@ -428,6 +435,43 @@ gulp default
 git status
 ```
 
+### Use as Ruby Gem
+
+You can use Type-on-strap as a [gem](https://rubygems.org/gems/type-on-strap). 
+
+Ruby Gem Method
+Add this line to your Jekyll site's Gemfile (or create one):
+
+```ruby
+gem "type-on-strap"
+```
+Add this line to your Jekyll site's `_config.yml` file:
+
+```yml
+theme: type-on-strap
+```
+
+Then run Bundler to install the theme gem and dependencies:
+
+```bash
+bundle install
+```
+
+Then you can start adding content like:
+  - Add a `index.html` file
+  - Add the feature page you want. (ex: as it is already in `pages`)
+  - Add posts in `_posts` and `_portfolio` to be displayed
+
+
+### Remote Theme
+
+Now you can use any theme gem with github pages with [29/11/2017 Github Pages Broadcast](https://github.com/blog/2464-use-any-theme-with-github-pages).
+For that remove all `theme:` attributes from `_config.yml` and add instead:
+
+```yml
+remote_theme: sylhare/Type-on-Strap 
+```
+
 ## License
 
 There are some fonts and component on this theme going under the MIT licence as well in this theme.

data/_data/language.yml

@@ -0,0 +1,13 @@
+# Localization strings
+str_follow_on: "Follow on"
+str_rss_follow: "Follow RSS feed"
+str_share_on: "Share on"
+str_add_to: "Add to"
+str_email: "Email"
+str_tweet: "Tweet"
+str_pin_it: "Pin it"
+str_next_post: "Next post"
+str_previous_post: "Previous post"
+str_next_page: "Next"
+str_previous_page: "Prev"
+str_javascript_required_disqus: "Please enable JavaScript to view comments."

data/_includes/blog.html

@@ -15,11 +15,11 @@
                 {{ post.title }}
               </a>
             </h1>
-            {% include post_info.html post=post %}
+            {% include post_info.html author=post.author date=post.date %}
           </header>
-          {% if site.theme_settings.excerpt %}
+          {% if site.excerpt or site.theme_settings.excerpt %}
               <div class="excerpt">
-                  {% if site.theme_settings.excerpt == "truncate" %}
+                  {% if site.excerpt == "truncate" %}
                      {{ post.content | strip_html | truncate: '250' | escape }}
                   {% else %}
                      {{ post.excerpt | strip_html | escape }}

data/_includes/blog_nav.html

@@ -4,16 +4,16 @@
         
         {% if paginator.previous_page and paginator.previous_page != 1%}
         <!-- << -->
-        <a aria-label="{{ site.theme_settings.str_previous_page }}" href="{{ '/' | relative_url }}" class="button">
+        <a aria-label="{{ site.data.language.str_previous_page | default: 'Prev' }}" href="{{ '/' | relative_url }}" class="button">
             <span><i class="fa fa-angle-double-left"></i></span>
         </a>
         {% endif %}
         
         <!-- < previous -->
-        <a aria-label="{{ site.theme_settings.str_previous_page }}" href="{{ paginator.previous_page_path | relative_url }}"
+        <a aria-label="{{ site.data.language.str_previous_page | default: 'Prev' }}" href="{{ paginator.previous_page_path | relative_url }}"
            {% unless paginator.previous_page %}style="visibility:hidden"{% endunless %} class="button">
             <span><i class="fa fa-chevron-left"></i></span>
-            {{ site.theme_settings.str_previous_page }}
+            {{ site.data.language.str_previous_page | default: "Prev" }}
         </a>
     </div>
 
@@ -24,15 +24,16 @@
     <div class="next">
         
         <!-- next > -->
-        <a aria-label="{{ site.theme_settings.str_next_page }}" href="{{ paginator.next_page_path | relative_url }}"
+        <a aria-label="{{ site.data.language.str_next_page | default: 'Next' }}" href="{{ paginator.next_page_path | relative_url }}"
            {% unless paginator.next_page %}style="visibility:hidden"{% endunless %} class="button">
-            {{ site.theme_settings.str_next_page }}
+            {{ site.data.language.str_next_page | default: "Next" }}
             <span><i class="fa fa-chevron-right"></i></span>
         </a>
 
         {% if paginator.next_page and paginator.next_page != paginator.total_pages %}
         <!-- >> -->
-        <a aria-label="{{ site.theme_settings.str_next_page }}" href="{{ site.paginate_path | relative_url | replace: ':num', paginator.total_pages }}" class="button">
+        <a aria-label="{{ site.data.language.str_next_page | default: 'Next' }}"
+        href="{{ site.paginate_path | relative_url | replace: ':num', paginator.total_pages }}" class="button">
             <span><i class="fa fa-angle-double-right"></i></span>
         </a>
         {% endif %}

data/_includes/disqus.html

@@ -1,10 +1,10 @@
 <div id="disqus_thread"></div>
 <script type="text/javascript">
-	var disqus_shortname = '{{ site.theme_settings.disqus_shortname }}';
+	var disqus_shortname = '{{ site.disqus_shortname }}';
 	(function() {
 		var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
 		dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
 		(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
 	})();
 </script>
-<noscript>{{ site.theme_settings.str_javascript_required_disqus }}</noscript>
+<noscript>{{ site.data.language.str_javascript_required_disqus | default: Please enable JavaScript to view comments." }}</noscript>

data/_includes/footer.html

@@ -1,6 +1,6 @@
 <footer class="site-footer">
     <p class="text">
-        {{ site.theme_settings.footer_text | default: "Powered by <a href='https://jekyllrb.com/'>Jekyll</a> with <a href='https://github.com/sylhare/Type-on-Strap'>Type on Strap</a>" }}</p>
+        {{ site.footer_text | default: "Powered by <a href='https://jekyllrb.com/'>Jekyll</a> with <a href='https://github.com/sylhare/Type-on-Strap'>Type on Strap</a>" }}</p>
             <div class="footer-icons">
                 <ul>
                 <!-- Social icons from Font Awesome, if enabled -->

data/_includes/head.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
 
     <!--Favicon-->
-    <link rel="shortcut icon" href="{{ site.theme_settings.favicon | relative_url }}" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ site.favicon | relative_url }}" type="image/x-icon">
 
     <!-- Canonical -->
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
@@ -31,26 +31,26 @@
 
     <!-- KaTeX 0.8.3 -->
     <!-- if you have any issue check https://github.com/KaTeX/KaTeX -->
-    {% if site.theme_settings.katex %}
+    {% if site.katex or site.theme_settings.katex %}
     <script src="{{ '/assets/js/vendor/katex.min.js' | relative_url }}"></script>
     {% endif %}
 
     <!-- Google Analytics -->
-    {% if site.theme_settings.google_analytics %}
+    {% if site.google_analytics %}
     <!-- Global site tag (gtag.js) -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.theme_settings.google_analytics }}"></script>
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
-      gtag('config', '{{ site.theme_settings.google_analytics }}');
+      gtag('config', '{{ site.google_analytics }}');
     </script>
     
     <!-- Page analysis (analytics.js) -->
     <script async src='https://www.google-analytics.com/analytics.js'></script>
     <script>
       window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
-      ga('create', '{{ site.theme_settings.google_analytics }}', 'auto');
+      ga('create', '{{ site.google_analytics }}', 'auto');
       ga('send', 'pageview');
     </script>
     {% endif %} <!-- End Google Analytics -->
@@ -60,6 +60,6 @@
     <!-- Manual seo tags -->
     <!--
     <title>{% if page.title %}{{ page.title }} |{% endif %} {{ site.title }}</title>
-    <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.theme_settings.description }}{% endif %}">
+    <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
     -->
 </head>

data/_includes/icons.html

@@ -1,6 +1,6 @@
-{% if site.theme_settings.rss %}
+{% if site.data.social.rss or site.theme_settings.rss %}
 <li>
-	<a href="{{ "feed.xml" | absolute_url }}" title="{{ site.theme_settings.str_rss_follow }}">
+	<a href="{{ "feed.xml" | absolute_url }}" title="{{ site.data.language.str_rss_follow | default: "Follow RSS feed" }}">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-rss fa-stack-1x fa-inverse"></i>
@@ -9,9 +9,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.email_address %}
+{% if site.data.social.email_address or site.theme_settings.email_address %}
 <li>
-	<a href="mailto:{{ site.theme_settings.email_address }}" title="{{ site.theme_settings.str_email }}">
+	<a href="mailto:{{ site.data.social.email_address }}" title="{{ site.data.language.str_email }}">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-envelope fa-stack-1x fa-inverse"></i>
@@ -20,9 +20,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.behance %}
+{% if site.data.social.behance or site.theme_settings.behance %}
 <li>
-	<a href="https://www.behance.net/{{ site.theme_settings.behance }}" title="{{ site.theme_settings.str_follow_on }} Behance">
+	<a href="https://www.behance.net/{{ site.data.social.behance }}" title="{{ site.data.language.str_follow_on }} Behance">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-behance fa-stack-1x fa-inverse"></i>
@@ -31,9 +31,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.bitbucket %}
+{% if site.data.social.bitbucket or site.theme_settings.bitbucket %}
 <li>
-	<a href="https://bitbucket.org/{{ site.theme_settings.bitbucket }}" title="{{ site.theme_settings.str_follow_on }} Bitbucket">
+	<a href="https://bitbucket.org/{{ site.data.social.bitbucket }}" title="{{ site.data.language.str_follow_on }} Bitbucket">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-bitbucket fa-stack-1x fa-inverse"></i>
@@ -42,9 +42,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.dribbble %}
+{% if site.data.social.dribbble or site.theme_settings.dribbble %}
 <li>
-	<a href="https://dribbble.com/{{ site.theme_settings.dribbble }}" title="{{ site.theme_settings.str_follow_on }} Dribbble">
+	<a href="https://dribbble.com/{{ site.data.social.dribbble }}" title="{{ site.data.language.str_follow_on }} Dribbble">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-dribbble fa-stack-1x fa-inverse"></i>
@@ -53,9 +53,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.facebook %}
+{% if site.data.social.facebook or site.theme_settings.facebook %}
 <li>
-	<a href="https://www.facebook.com/{{ site.theme_settings.facebook }}" title="{{ site.theme_settings.str_follow_on }} Facebook">
+	<a href="https://www.facebook.com/{{ site.data.social.facebook }}" title="{{ site.data.language.str_follow_on }} Facebook">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-facebook fa-stack-1x fa-inverse"></i>
@@ -64,9 +64,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.flickr %}
+{% if site.data.social.flickr or site.theme_settings.flickr %}
 <li>
-	<a href="https://www.flickr.com/photos/{{ site.theme_settings.flickr }}" title="{{ site.theme_settings.str_follow_on }} Flickr">
+	<a href="https://www.flickr.com/photos/{{ site.data.social.flickr }}" title="{{ site.data.language.str_follow_on }} Flickr">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-flickr fa-stack-1x fa-inverse"></i>
@@ -75,9 +75,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.github %}
+{% if site.data.social.github or site.theme_settings.github %}
 <li>
-	<a href="https://github.com/{{ site.theme_settings.github }}" title="{{ site.theme_settings.str_follow_on }} GitHub">
+	<a href="https://github.com/{{ site.data.social.github }}" title="{{ site.data.language.str_follow_on }} GitHub">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-github fa-stack-1x fa-inverse"></i>
@@ -86,9 +86,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.instagram %}
+{% if site.data.social.instagram or site.theme_settings.instagram %}
 <li>
-	<a href="http://instagram.com/{{ site.theme_settings.instagram }}" title="{{ site.theme_settings.str_follow_on }} Instagram">
+	<a href="http://instagram.com/{{ site.data.social.instagram }}" title="{{ site.data.language.str_follow_on }} Instagram">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-instagram fa-stack-1x fa-inverse"></i>
@@ -97,9 +97,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.keybase %}
+{% if site.data.social.keybase or site.theme_settings.keybase %}
 <li>
-	<a href="https://keybase.io/{{ site.theme_settings.keybase }}" title="{{ site.theme_settings.str_follow_on }} Keybase">
+	<a href="https://keybase.io/{{ site.data.social.keybase }}" title="{{ site.data.language.str_follow_on }} Keybase">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-key fa-stack-1x fa-inverse"></i>
@@ -108,9 +108,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.linkedin %}
+{% if site.data.social.linkedin or site.theme_settings.linkedin %}
 <li>
-	<a href="{{ site.theme_settings.linkedin }}" title="{{ site.theme_settings.str_follow_on }} LinkedIn">
+	<a href="{{ site.data.social.linkedin }}" title="{{ site.data.language.str_follow_on }} LinkedIn">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-linkedin fa-stack-1x fa-inverse"></i>
@@ -119,9 +119,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.pinterest %}
+{% if site.data.social.pinterest or site.theme_settings.pinterest %}
 <li>
-	<a href="http://www.pinterest.com/{{ site.theme_settings.pinterest }}" title="{{ site.theme_settings.str_follow_on }} Pinterest">
+	<a href="http://www.pinterest.com/{{ site.data.social.pinterest }}" title="{{ site.data.language.str_follow_on }} Pinterest">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-pinterest fa-stack-1x fa-inverse"></i>
@@ -130,9 +130,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.reddit %}
+{% if site.data.social.reddit or site.theme_settings.reddit %}
 <li>
-	<a href="https://www.reddit.com/user/{{ site.theme_settings.reddit }}" title="{{ site.theme_settings.str_follow_on }} Reddit">
+	<a href="https://www.reddit.com/user/{{ site.data.social.reddit }}" title="{{ site.data.language.str_follow_on }} Reddit">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-reddit fa-stack-1x fa-inverse"></i>
@@ -141,9 +141,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.soundcloud %}
+{% if site.data.social.soundcloud or site.theme_settings.soundcloud %}
 <li>
-	<a href="https://soundcloud.com/{{ site.theme_settings.soundcloud }}" title="{{ site.theme_settings.str_follow_on }} SoundCloud">
+	<a href="https://soundcloud.com/{{ site.data.social.soundcloud }}" title="{{ site.data.language.str_follow_on }} SoundCloud">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-soundcloud fa-stack-1x fa-inverse"></i>
@@ -152,9 +152,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.stack_exchange %}
+{% if site.data.social.stack_exchange or site.theme_settings.stack_exchange %}
 <li>
-	<a href="{{ site.theme_settings.stack_exchange }}" title="{{ site.theme_settings.str_follow_on }} Stack Exchange">
+	<a href="{{ site.data.social.stack_exchange }}" title="{{ site.data.language.str_follow_on }} Stack Exchange">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-stack-exchange fa-stack-1x fa-inverse"></i>
@@ -163,9 +163,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.stack_overflow %}
+{% if site.data.social.stack_overflow or site.theme_settings.stack_overflow %}
 <li>
-    <a href="{{ site.theme_settings.stack_overflow }}" title="{{ site.theme_settings.str_follow_on }} Stack Overflow">
+    <a href="{{ site.data.social.stack_overflow }}" title="{{ site.data.language.str_follow_on }} Stack Overflow">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-stack-overflow fa-stack-1x fa-inverse"></i>
@@ -174,9 +174,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.steam %}
+{% if site.data.social.steam or site.theme_settings.steam %}
 <li>
-	<a href="http://steamcommunity.com/id/{{ site.theme_settings.steam }}" title="{{ site.theme_settings.str_follow_on }} Steam">
+	<a href="http://steamcommunity.com/id/{{ site.data.social.steam }}" title="{{ site.data.language.str_follow_on }} Steam">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-steam fa-stack-1x fa-inverse"></i>
@@ -185,9 +185,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.tumblr %}
+{% if site.data.social.tumblr or site.theme_settings.tumblr %}
 <li>
-	<a href="http://{{ site.theme_settings.tumblr }}.tumblr.com/" title="{{ site.theme_settings.str_follow_on }} Tumblr">
+	<a href="http://{{ site.data.social.tumblr }}.tumblr.com/" title="{{ site.data.language.str_follow_on }} Tumblr">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-tumblr fa-stack-1x fa-inverse"></i>
@@ -196,9 +196,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.gitlab %}
+{% if site.data.social.gitlab or site.theme_settings.gitlab %}
 <li>
-	<a href="https://gitlab.com/{{ site.theme_settings.gitlab }}" title="{{ site.theme_settings.str_follow_on }} Gitlab">
+	<a href="https://gitlab.com/{{ site.data.social.gitlab }}" title="{{ site.data.language.str_follow_on }} Gitlab">
         <span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-gitlab fa-stack-1x fa-inverse"></i>
@@ -207,9 +207,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.twitter %}
+{% if site.data.social.twitter or site.theme_settings.twitter %}
 <li>
-	<a href="https://twitter.com/{{ site.theme_settings.twitter }}" title="{{ site.theme_settings.str_follow_on }} Twitter" class="type">
+	<a href="https://twitter.com/{{ site.data.social.twitter }}" title="{{ site.data.language.str_follow_on }} Twitter" class="type">
         <span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-twitter fa-stack-1x fa-inverse"></i>
@@ -218,9 +218,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.vimeo %}
+{% if site.data.social.vimeo or site.theme_settings.vimeo %}
 <li>
-	<a href="https://vimeo.com/{{ site.theme_settings.vimeo }}" title="{{ site.theme_settings.str_follow_on }} Vimeo" class="type">
+	<a href="https://vimeo.com/{{ site.data.social.vimeo }}" title="{{ site.data.language.str_follow_on }} Vimeo" class="type">
         <span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-vimeo fa-stack-1x fa-inverse"></i>
@@ -229,9 +229,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.wordpress %}
+{% if site.data.social.wordpress or site.theme_settings.wordpress %}
 <li>
-	<a href="https://{{ site.theme_settings.wordpress }}.wordpress.com/" title="{{ site.theme_settings.str_follow_on }} WordPress">
+	<a href="https://{{ site.data.social.wordpress }}.wordpress.com/" title="{{ site.data.language.str_follow_on }} WordPress">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-wordpress fa-stack-1x fa-inverse"></i>
@@ -240,9 +240,9 @@
 </li>
 {% endif %}
 
-{% if site.theme_settings.youtube %}
+{% if site.data.social.youtube or site.theme_settings.youtube %}
 <li>
-	<a href="https://www.youtube.com/user/{{ site.theme_settings.youtube }}" title="{{ site.theme_settings.str_follow_on }} YouTube">
+	<a href="https://www.youtube.com/user/{{ site.data.social.youtube }}" title="{{ site.data.language.str_follow_on }} YouTube">
 		<span class="fa-stack fa-lg">
             <i class="fa fa-circle fa-stack-2x"></i>
             <i class="fa fa-youtube fa-stack-1x fa-inverse"></i>

data/_includes/navbar.html

@@ -2,9 +2,9 @@
 
     <!-- Logo and title -->
 	<div class="branding">
-        {% if site.theme_settings.avatar %}
+        {% if site.avatar %}
 		<a href="{{ '/' | relative_url }}">
-			<img alt="logo img" class="avatar" src="{{ site.theme_settings.avatar | relative_url }}" />
+			<img alt="logo img" class="avatar" src="{{ site.avatar | relative_url }}" />
 		</a>
         {% endif %}
 

data/_includes/post_info.html

@@ -1,22 +1,13 @@
-{%- assign author-id = include.post.author-id -%}
-
-{%- assign author_name = site.authors[author-id].name | default: author-id -%}
-{%- assign avatar = site.authors[author-id].avatar -%}
-{%- assign author_url = site.authors[author-id].url -%}
-{%- assign date = include.post.date -%}
-{%- if (author_url and (avatar or author_name)) -%}
-  {%- assign render_url = true -%}
-{%- else -%}
-  {%- assign render_url = false -%}
-{% endif %}
+{% assign author = site.data.authors[include.author] %}
+{% assign date = include.date %}
 
 <div class="post-info">
-  {%- if render_url -%}<a href="{{ author_url | relative_url }}" target="_blank">{%- endif -%}
-    {% if avatar %}
-      <img src="{{ avatar | relative_url }}">
+  {%- if author.url -%}<a href="{{ author.url | relative_url }}" target="_blank">{%- endif -%}
+    {% if author.avatar  %}
+      <img src="{{ author.avatar | relative_url }}">
     {% endif %}
     <p class="meta">
-      {% if author_name %}{{ author_name }} - {% endif %}{{ date | date: "%B %-d, %Y" }}
+      {% if author.name %}{{ author.name }} - {% endif %}{{ date | date: "%B %-d, %Y" }}
     </p>
-  {%- if render_url -%}</a>{%- endif -%}
+  {%- if author.url -%}</a>{%- endif -%}
 </div>

data/_includes/post_nav.html

@@ -2,7 +2,7 @@
     {% if page.next.url %}
     <div id="previous-post">
         <a alt="{{ page.next.title }}" href="{{ page.next.url | relative_url }}">
-            <p>{{ site.theme_settings.str_previous_post }}</p>
+            <p>{{ site.data.language.str_previous_post | default: "Previous post" }}</p>
             {{ page.next.title }}
         </a>
     </div>
@@ -11,7 +11,7 @@
     {% if page.previous.url %}
     <div id="next-post">
         <a alt="{{ page.previous.title }}" href="{{ page.previous.url | relative_url }}">
-            <p>{{ site.theme_settings.str_next_post }}</p>
+            <p>{{ site.data.language.str_next_post | default: "Next post"}}</p>
             {{ page.previous.title }}
         </a>
     </div>

data/_includes/share_buttons.html

@@ -1,67 +1,67 @@
 <div class="share-buttons">
     <ul class="share-buttons">
         <div class="meta">Share</div>
-        {% if site.theme_settings.share_buttons.facebook %}
+        {% if site.data.social.share.facebook or site.theme_settings.share_buttons.facebook %}
         <li>
-            <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url }}" target="_blank" title="{{ site.theme_settings.str_share_on }} Facebook">
+            <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url | url_encode }}" target="_blank" title="{{ site.data.social.language.str_share_on }} Facebook">
 			<i class="fa fa-facebook-square fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_share_on }} Facebook</span>
+			<span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} Facebook</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.twitter %}
+        {% endif %} {% if site.data.social.share.twitter or site.theme_settings.twitter %}
         <li>
-            <a href="https://twitter.com/intent/tweet?source={{ page.url | absolute_url }}&text={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}:%20{{ page.url | absolute_url }}" target="_blank" title="{{ site.theme_settings.str_tweet }}">
+            <a href="https://twitter.com/intent/tweet?text={{ page.title | url_encode }}%20{{ page.url | absolute_url | url_encode }}" target="_blank" title="{{ site.data.social.language.str_tweet }}">
 			<i class="fa fa-twitter-square fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_tweet }}</span>
+			<span class="sr-only">{{ site.data.social.language.str_tweet | default: "Tweet" }}</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.tumblr %}
+        {% endif %} {% if site.data.social.share.tumblr or site.theme_settings.tumblr %}
         <li>
-            <a href="http://www.tumblr.com/share?v=3&u={{ page.url | absolute_url }}&quote={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&s=" target="_blank" title="{{ site.theme_settings.str_share_on }} Tumblr">
+            <a href="http://www.tumblr.com/share?v=3&u={{ page.url | absolute_url }}&quote={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&s=" target="_blank" title="{{ site.data.social.language.str_share_on }} Tumblr">
 			<i class="fa fa-tumblr-square fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_share_on }} Tumblr</span>
+			<span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} Tumblr</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.pinterest %}
+        {% endif %} {% if site.data.social.share.pinterest or site.theme_settings.pinterest %}
         <li>
-            <a href="http://pinterest.com/pin/create/button/?url={{ page.url | absolute_url }}&description=" target="_blank" title="{{ site.theme_settings.str_pin_it }}">
+            <a href="http://pinterest.com/pin/create/button/?url={{ page.url | absolute_url }}&description={{ page.excerpt }}" target="_blank" title="{{ site.data.social.language.str_pin_it }}">
 			<i class="fa fa-pinterest-square fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_pin_it }}</span>
+			<span class="sr-only">{{ site.data.social.language.str_pin_it | default: "Pin it" }}</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.pocket %}
+        {% endif %} {% if site.data.social.share.pocket or site.theme_settings.pocket %}
         <li>
-            <a href="https://getpocket.com/save?url={{ page.url | absolute_url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}" target="_blank" title="{{ site.theme_settings.str_add_to }} Pocket">
+            <a href="https://getpocket.com/save?url={{ page.url | absolute_url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}" target="_blank" title="{{ site.data.social.language.str_add_to }} Pocket">
 			<i class="fa fa fa-get-pocket fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_add_to }} Pocket</span>
+			<span class="sr-only">{{ site.data.social.language.str_add_to | default: "Add to" }} Pocket</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.reddit %}
+        {% endif %} {% if site.data.social.share.reddit or site.theme_settings.reddit %}
         <li>
-            <a href="http://www.reddit.com/submit?url={{ page.url | absolute_url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}" target="_blank" title="{{ site.theme_settings.str_share_on }} Reddit">
+            <a href="http://www.reddit.com/submit?url={{ page.url | absolute_url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}" target="_blank" title="{{ site.data.social.language.str_share_on }} Reddit">
 			<i class="fa fa-reddit-square fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_share_on }} Reddit</span>
+			<span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} Reddit</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.linkedin %}
+        {% endif %} {% if site.data.social.share.linkedin or site.theme_settings.linkedin %}
         <li>
-            <a href="http://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&summary=&source={{ page.url | absolute_url }}" target="_blank" title="{{ site.theme_settings.str_share_on }} LinkedIn">
+            <a href="http://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&summary=&source={{ page.url | absolute_url }}" target="_blank" title="{{ site.data.social.language.str_share_on }} LinkedIn">
 			<i class="fa fa-linkedin fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_share_on }} LinkedIn</span>
+			<span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} LinkedIn</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.wordpress %}
+        {% endif %} {% if site.data.social.share.wordpress or site.theme_settings.wordpress %}
         <li>
-            <a href="http://wordpress.com/press-this.php?u={{ page.url | absolute_url }}&quote={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&s=" target="_blank" title="{{ site.theme_settings.str_share_on }} WordPress">
+            <a href="http://wordpress.com/press-this.php?u={{ page.url | absolute_url }}&quote={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&s=" target="_blank" title="{{ site.data.social.language.str_share_on }} WordPress">
 			<i class="fa fa-wordpress fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_share_on }} WordPress</span>
+			<span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} WordPress</span>
 		</a>
         </li>
-        {% endif %} {% if site.theme_settings.share_buttons.email %}
+        {% endif %} {% if site.data.social.share.email or site.theme_settings.email %}
         <li>
-            <a href="mailto:?subject={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&body=:%20{{ page.url | absolute_url }}" target="_blank" title="{{ site.theme_settings.str_email }}">
+            <a href="mailto:?subject={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&body=:%20{{ page.url | absolute_url }}" target="_blank" title="{{ site.data.social.language.str_email }}">
 			<i class="fa fa-envelope-square fa-2x" aria-hidden="true"></i>
-			<span class="sr-only">{{ site.theme_settings.str_email }}</span>
+			<span class="sr-only">{{ site.data.social.language.str_email | default: "Email" }}</span>
 		</a>
         </li>
         {% endif %}

data/_includes/share_thumbnail.html

@@ -4,4 +4,4 @@
 <meta property="og:type"         content="article" />
 <meta property="og:title"        content="{{ page.title | strip_html | truncate: '250' | escape }}" />
 <meta property="og:description"  content="{{ page.excerpt | strip_html | truncate: '250' | escape }}" />
-<meta property="og:image"        content="{{ page.feature-img | default: site.theme_settings.header_feature_image }}" />
+<meta property="og:image"        content="{{ page.feature-img | default: site.header_feature_image }}" />

data/_layouts/custom.html

@@ -23,13 +23,13 @@ layout: default
 </article>
 
 <!-- Disqus -->
-{% if site.theme_settings.disqus_shortname %}
+{% if site.disqus_shortname %}
 <div class="comments">
   {% include disqus.html %}
 </div>
 {% endif %}
 
 <!-- Post navigation -->
-{% if site.theme_settings.post_navigation %}
+{% if site.post_navigation %}
   {% include post_nav.html %}
-{% endif %}
+{% endif %}

data/_layouts/default.html

@@ -1,4 +1,10 @@
 <!DOCTYPE html>
+<!--
+    Type on Strap jekyll theme v2.0.0
+    Copyright 2016-2019 Sylhare
+    Theme free for personal and commercial use under the MIT license
+    https://github.com/sylhare/Type-on-Strap/blob/master/LICENSE
+-->
 <html lang="en">
   {% include head.html %}
   <body>

data/_layouts/home.html

@@ -5,8 +5,8 @@ layout: default
 <div class="home">
 
   <div id="main" class="call-out"
-       style="background-image: url('{{ site.theme_settings.header_feature_image | relative_url }}')">
-    <h1> {{ site.theme_settings.header_text | default: "Change <code>header_text</code> in <code>_config.yml</code>"}} </h1>
+       style="background-image: url('{{ site.header_feature_image | relative_url }}')">
+    <h1> {{ site.header_text | default: "Change <code>header_text</code> in <code>_config.yml</code>"}} </h1>
   </div>
 
   {% include blog.html %}

data/_layouts/post.html

@@ -7,7 +7,7 @@ layout: default
   <header id="main" style="">
     {% unless page.hide_title %}
       <h1 id="{{ page.title | cgi_escape }}" class="title">{{ page.title }}</h1>
-      {% include post_info.html post=page %}
+      {% include post_info.html author=page.author date=page.date %}
     {% endunless %}
   </header>
   <section class="post-content">
@@ -30,14 +30,14 @@ layout: default
 </article>
 
 <!-- Disqus -->
-{% if site.theme_settings.disqus_shortname %}
+{% if site.disqus_shortname or site.theme_settings.disqus_shortname %}
 <div class="comments">
   {% include disqus.html %}
 </div>
 {% endif %}
 
 <!-- Post navigation -->
-{% if site.theme_settings.post_navigation %}
+{% if site.post_navigation  or site.theme_settings.post_navigation %}
   {% include post_nav.html %}
 {% endif %}
 
@@ -54,6 +54,6 @@ layout: default
   header#main {
     background-repeat:no-repeat;
     {% if page.feature-img %} background-image: url('{{ page.feature-img | relative_url }}');
-    {% elsif page.color %}background-image: url('{{ site.theme_settings.color_image | relative_url }}');  {% endif %}
+    {% elsif page.color %}background-image: url('{{ site.color_image | relative_url }}');  {% endif %}
   }
 </style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: type-on-strap
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sylhare
@@ -9,28 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.5
+        version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.5
+        version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: jekyll-feed
   requirement: !ruby/object:Gem::Requirement
@@ -77,33 +77,36 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
-description: A custom Type Theme template (a free and open-source Jekyll theme). Great
+        version: 2.1.0
+description: A simple and responsive jekyll theme template based on type-theme. Great
   for blogs, easy to customize and responsive.
 email:
 - sylhare@outlook.com
 - hellorohan@outlook.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- LICENSE
 files:
 - LICENSE
 - README.md
+- _data/language.yml
 - _includes/blog.html
 - _includes/blog_nav.html
 - _includes/disqus.html
@@ -125,11 +128,9 @@ files:
 - _layouts/post.html
 - _layouts/search.html
 - _layouts/tags.html
-- _sass/.DS_Store
 - _sass/base/_global.scss
 - _sass/base/_utility.scss
 - _sass/base/_variables.scss
-- _sass/external/.DS_Store
 - _sass/external/_font-awesome.scss
 - _sass/external/_katex.scss
 - _sass/external/_pacifico.scss
@@ -163,14 +164,11 @@ files:
 - _sass/layouts/_search.scss
 - _sass/layouts/_tags.scss
 - _sass/type-on-strap.scss
-- assets/css/.DS_Store
 - assets/css/bootstrap-iso.less
 - assets/css/main.scss
 - assets/css/vendor/bootstrap-iso.css
 - assets/css/vendor/bootstrap-iso.min.css
 - assets/css/vendor/bootstrap.css
-- assets/data/search.json
-- assets/fonts/.DS_Store
 - assets/fonts/Pacifico/Pacifico.eot
 - assets/fonts/Pacifico/Pacifico.svg
 - assets/fonts/Pacifico/Pacifico.ttf
@@ -278,23 +276,38 @@ files:
 homepage: https://github.com/sylhare/Type-on-Strap
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
-rdoc_options: []
+metadata:
+  plugin_type: theme
+post_install_message: |
+  ----------------------------------------------------------
+
+  Type on strap v2+ is using Jekyll 4.0:
+
+    * Please make sure you have updated your _config.yml.
+
+    * Use _data/ for social and language customization
+
+    * Vist https://github.com/sylhare/Type-on-Strap
+    for more info.
+
+  ----------------------------------------------------------
+rdoc_options:
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A simple and responsive jekyll theme template

data/assets/data/search.json

@@ -1,29 +0,0 @@
----
----
-[
-  {% for post in site.posts %}
-  {
-    "title"    : "{{ post.title | escape }}",
-    "category" : "{{ post.category }}",
-    "tags"     : "{{ post.tags | join: ', ' | prepend: " " }}",
-    "url"      : "{{ post.url | relative_url }}",
-    "date"     : "{{ post.date | date: "%B %-d, %Y" }}",
-    "excerpt"  : {{ post.content | strip_html | truncate: '250' | escape | jsonify }},
-  "content"  : {{ post.content | strip_html | escape | jsonify }}
-} {% unless forloop.last %},{% endunless %}
-  {% endfor %}
-  {% if site.portfolio.size > 0 %},{% endif %}
-  {% for page in site.portfolio %}
-  {
-  {% if page.title != nil %}
-  "title"    : "{{ page.title | escape }}",
-  "category" : "{{ page.category }}",
-  "tags"     : "{{ page.tags | join: ', ' | prepend: " " }}",
-  "url"      : "{{ page.url | relative_url }}",
-  "date"     : "{{ page.date | date: "%B %-d, %Y" }}",
-  "excerpt"  : {{ page.content | strip_html | truncate: '250' | jsonify }},
-  "content"  : {{ page.content | strip_html | escape | jsonify }}
-  {% endif %}
-} {% unless forloop.last %},{% endunless %}
-  {% endfor %}
-]