type-on-strap 0.5.3 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bad504dcdfc7c8ebdfacd2e2891ff14c1bc1207
-  data.tar.gz: 97c5fffe56086fffd571762ab90a5518817bf30e
+  metadata.gz: 18220ff2bed115de2551c0c321e20eb7f00ced8b
+  data.tar.gz: 5fa58a662a070f5e6fa29557a8bd96e4288c98b0
 SHA512:
-  metadata.gz: 85bb8a6e1647d83f4bf6a535d40167e59724152b4361f33c9d1818194dfc9f4af15ed666d8910182eee8c8ed816647daeb678dd238b9cda892fd689cd003f426
-  data.tar.gz: c58bd421161c8072c36ca2ed390c41348749f365090fb27560f2c99e3f61dfbdf402881a42004cd3150e0ef3c59faf8147969e6d5f77e4e6bb1f7a14881d160e
+  metadata.gz: c7d1318ac7cbc99abac531afe29bd37b72356417b3635f559bf51f97e96010eaef1819231b3edf8b4061475a2b5b277f79dd6bc5409dbd2d09a40bae8873971a
+  data.tar.gz: b6564989ef79bdac3295e4c437f6c28927c485efa0bec9dfeffb6d2e2d3ae71dfa3e562a4cf7280ca9055014765d2258fc3369ac5a4645900ad62a4d92a2a2e5

data/README.md

@@ -1,6 +1,6 @@
 # Type on Strap 
 
-[![Build Status](https://travis-ci.org/Sylhare/Type-on-Strap.svg?branch=master)](https://travis-ci.org/Sylhare/Type-on-Strap) 
+[![Build Status](https://travis-ci.org/sylhare/Type-on-Strap.svg?branch=master)](https://travis-ci.org/sylhare/Type-on-Strap)
 [![Gem Version](https://badge.fury.io/rb/type-on-strap.svg)](https://badge.fury.io/rb/type-on-strap)
 
 A free and open-source [Jekyll](https://jekyllrb.com) theme. Based on Rohan Chandra [type-theme](https://github.com/rohanchandra/type-theme) with a few new features:
@@ -58,7 +58,8 @@ jekyll-theme-basically-basic
 ├── pages
 |   ├── 404.md		       # To be displayed when url is wrong
 |   ├── about.md               # About example page
-|   ├── portfolio.html	       # Portfolio bootstrapped page
+|   ├── gallery.md             # Gallery page for your photos
+|   ├── portfolio.md	       # Portfolio page for your projects
 |   ├── search.html	       # Search page
 |   └── search.json            # Specify the search target (page, post, collection)
 ├── _config.yml                # sample configuration
@@ -235,15 +236,18 @@ This are the basic features you can use with the  `post` layout.
 ---
 layout: post
 title: Hello World                                # Title of the page
-subtitle: "This is a subtitle"                    # A subtitle can be displayed below your title
+hide_title: true                                  # Hide the title when displaying the post, but shown in lists of posts
 feature-img: "assets/img/sample.png"              # Add a feature-image to the post
 thumbnail: "assets/img/thumbnail/sample-th.png"   # Add a thumbnail image on blog view
+bootstrap: true                                   # Add bootstrap to the page
 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.
 
+So the **bootstrap** is not mandatory and is only usefull if you want to add bootstrapped content in your page. It will respect the page and theme layout, mind the padding on the sides.
+
 ### Layout: Page
 
 The page layout have a bit more features explained here.
@@ -262,16 +266,6 @@ tags: [sample, markdown, html]
 
 The hide only hides your page from the navigation bar, it is however still generated and can be access through its link. Use the `_draft` folder to keep files from being generated on your site.
 
-### Layout: Bootstrap
-
-This is the page layout modified to have bootstrap activated to format your content accordingly with the theme.
-
-```yml
---- 
-layout: bootstrap
----
-```
-
 ### Layout: Default
 
 This layout includes the head, navigation bar and footer around your content.
@@ -287,14 +281,16 @@ Here are the documentation for the other feature pages that can be added through
 This page is the used as the home page of the template (in the `index.html`). It displays the list of article in `_posts`.
 You can use this layout in another page (adding a title to it will make it appear in the navigation bar).
 
+The recommended width and height for the home picture is width:`2484px;` and height:`1280px` which are the dimension of the actual picture for it to be rolling down as you scroll the page. 
+
 ### Portfolio
 
-Portfolio is a feature bootstrapped page that will take all the markdown/html files in the `_portfolio` folder to create a 3-columns image portfolio matrix.
+Portfolio is a feature page that will take all the markdown/html files in the `_portfolio` folder to create a 3-columns image portfolio matrix.
 
 To use the portfolio, simply create a `portfolio.md` with this information inside:
 ```yml
 --- 
-layout: bootstrap 
+layout: page
 title : Portfolio 
 ---
 
@@ -320,7 +316,7 @@ gallery: "assets/img/pexels"
 
 The search feature is based on [Simple-Jekyll-search](https://github.com/christian-fei/Simple-Jekyll-Search) there is a `search.json` file that will create a list of all of the site posts, pages and portfolios. 
 
-Then there's a `search.js` displaying the formated results entered in the `search.html` page. 
+Then there's a `search.js` displaying the formatted results entered in the `search.html` page.
 
 
 The search page can be enable/disable in the navigation bar through the `_config.yml` via:
@@ -333,7 +329,7 @@ special_page:
 
 ### Tags
 
-Tags should be placed between `[]` in your post metadata. Seperate each tag with a comma. Tags are recommended for posts and portfolio items.
+Tags should be placed between `[]` in your post metadata. Separate each tag with a comma. Tags are recommended for posts and portfolio items.
 
 For example:
 

data/_includes/blog.html

@@ -0,0 +1,42 @@
+<div class="posts">
+    {% for post in paginator.posts %}
+    <div class="post-teaser">
+        {% if post.thumbnail %}
+        <div class="post-img">
+            <img alt="{{ post.title }}" src="{{ site.baseurl }}/{{ post.thumbnail }}">
+        </div>
+        {% endif %}
+        <span>
+          <header>
+            <h1>
+              <a alt="{{ post.title }}" class="post-link" href="{{ post.url | prepend: site.baseurl }}">
+                {{ post.title }}
+              </a>
+            </h1>
+            <p class="meta">
+              {{ post.date | date: "%B %-d, %Y" }}
+            </p>
+          </header>
+          <div class="excerpt">
+              {{ post.excerpt | strip_html | escape }}
+          </div>
+      </span>
+    </div>
+    {% endfor %}
+</div>
+
+{% if paginator.total_pages > 1 %}
+<div class="pagination">
+    {% if paginator.previous_page %}
+    <a alt="{{ site.theme_settings.str_previous_page }}" 
+       href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="button">
+      <i class="fa fa-chevron-left"></i>
+      {{ site.theme_settings.str_previous_page }}
+    </a> {% endif %} {% if paginator.next_page %}
+    <a alt="{{ site.theme_settings.str_next_page }}" 
+       href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="button">
+      {{ site.theme_settings.str_next_page }}
+      <i class="fa fa-chevron-right"></i>
+    </a> {% endif %}
+</div>
+{% endif %}

data/_includes/head.html

@@ -20,6 +20,18 @@
     <!-- Font Awesome -->
     <!-- <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
     <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/assets/css/vendor/font-awesome.min.css">
+    
+    {% if page.bootstrap %}
+    <!-- Bootstrap-4.1.3 isolation CSS -->
+    <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/assets/css/vendor/bootstrap-iso.min.css">
+
+    <!-- JQuery 3.3.1 -->
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <!-- Popper, a dependency of Bootstrap-->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+    <!-- Bootstrap 4.1.3 compiled and minified JavaScript -->
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+    {% endif %}
 
     <!-- Google Fonts -->
     {% if site.theme_settings.google_fonts %}

data/_includes/navbar.html

@@ -2,18 +2,19 @@
     
     <!-- Logo and title -->
 	<div class="branding">
-		<a href="{{ site.baseurl }}/">
-			<img class="avatar" src="{{ site.baseurl }}/{{ site.theme_settings.avatar }}" alt=""/>
+		<a alt="logo" href="{{ site.baseurl }}/">
+			<img alt="logo img" class="avatar" src="{{ site.baseurl }}/{{ site.theme_settings.avatar }}"/>
 		</a>
 
 		<h1 class="site-title">
-			<a href="{{ site.baseurl }}/">{{ site.theme_settings.title }}</a>
+			<a alt="{{ site.theme_settings.title }}" href="{{ site.baseurl }}/">
+                {{ site.theme_settings.title }}</a>
 		</h1>
 	</div>
     
     <!-- Toggle menu -->
     <nav class="clear">
-    <a id="pull" class="toggle" href="#">
+    <a name="pull" id="pull" class="toggle" href="#">
     <i class="fa fa-bars fa-lg"></i>
     </a>
     
@@ -28,7 +29,8 @@
         {% else %}
         <li class="separator"> | </li>
         <li>
-            <a class="clear" href="{{ page.url | relative_url }}">
+            <a class="clear" name="{{ page.title }}" 
+               href="{{ page.url | relative_url }}">
                 {{ page.title }}
             </a>
         </li>
@@ -42,7 +44,8 @@
           {% if item[1].enabled %}
             <li class="separator"> | </li>
             <li>
-                <a class="clear" href="{{ site.url }}{{ site.baseurl }}/{{ item[1].icon }}">
+                <a class="clear" id="{{ item[0] }}" name="{{ item[0] }}"
+                   href="{{ site.url }}{{ site.baseurl }}/{{ item[0] }}">
                     <i class="fa fa-{{ item[1].icon }}" aria-hidden="true"></i>
                 </a>
             </li>

data/_includes/portfolio.html

@@ -1,17 +1,16 @@
 <!-- Portfolio Grid Section -->
-<section class="portfolio">
-    <div class="row">
-        {% for item in site.portfolio %}
-        <div class="col-sm-4 col-xs-4 portfolio-item">
-            <a href="{{ site.baseurl }}{{ item.url }}" class="portfolio-link" data-keyboard="true">
-                <div class="caption" title="{{ item.title }}">
-                    <div class="caption-content">
-                        <i class="fa fa-search-plus fa-3x"></i>
-                    </div>
+
+<div class="portfolio-grid">
+    {% for item in site.portfolio %}
+    <div class="portfolio-cell">
+        <a href="{{ site.baseurl }}{{ item.url }}" class="portfolio-link" data-keyboard="true">
+            <div class="caption" title="{{ item.title }}">
+                <div class="caption-content">
+                    <i class="fa fa-search-plus fa-3x"></i>
                 </div>
-                <img src="{{ site.baseurl }}/{{ item.img }}" class="" alt="">
-            </a>
-        </div>
-        {% endfor %}
+            </div>
+            <img src="{{ site.baseurl }}/{{ item.img }}" class="" alt="">
+        </a>
     </div>
-</section>
+    {% endfor %}
+</div>

data/_includes/post_nav.html

@@ -2,7 +2,7 @@
   {% if page.previous.url %}
   <div id="previous-post" class="post-nav-post">
       <p>{{ site.theme_settings.str_previous_post }}</p>
-      <a href="{{ site.baseurl }}{{ page.previous.url }}">
+      <a alt="{{ page.previous.title }}" href="{{ site.baseurl }}{{ page.previous.url }}">
         {{ page.previous.title }}
       </a>
   </div>
@@ -10,7 +10,7 @@
   {% if page.next.url %}
   <div id="next-post" class="post-nav-post">
       <p>{{ site.theme_settings.str_next_post }}</p>
-      <a href="{{ site.baseurl }}{{ page.next.url }}">
+      <a alt="{{ page.next.title }}" href="{{ site.baseurl }}{{ page.next.url }}">
         {{ page.next.title }}
       </a>
   </div>

data/_includes/share_buttons.html

@@ -0,0 +1,76 @@
+<div class="share-buttons">
+    <ul class="share-buttons">
+        <div class="meta">Share</div>
+        {% if site.theme_settings.share_buttons.facebook %}
+        <li>
+            <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | prepend: site.baseurl | prepend: site.url }}" target="_blank" title="{{ site.theme_settings.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>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.twitter %}
+        <li>
+            <a href="https://twitter.com/intent/tweet?source={{ page.url | prepend: site.baseurl | prepend: site.url }}&text={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}:%20{{ page.url | prepend: site.baseurl | prepend: site.url }}" target="_blank" title="{{ site.theme_settings.str_tweet }}">
+			<i class="fa fa-twitter-square fa-2x" aria-hidden="true"></i>
+			<span class="sr-only">{{ site.theme_settings.str_tweet }}</span>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.google_plus %}
+        <li>
+            <a href="https://plus.google.com/share?url={{ page.url | prepend: site.baseurl | prepend: site.url }}" target="_blank" title="{{ site.theme_settings.str_share_on }} Google+">
+			<i class="fa fa-google-plus-square fa-2x" aria-hidden="true"></i>
+			<span class="sr-only">{{ site.theme_settings.str_share_on }} Google+</span>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.tumblr %}
+        <li>
+            <a href="http://www.tumblr.com/share?v=3&u={{ page.url | prepend: site.baseurl | prepend: site.url }}&quote={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&s=" target="_blank" title="{{ site.theme_settings.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>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.pinterest %}
+        <li>
+            <a href="http://pinterest.com/pin/create/button/?url={{ page.url | prepend: site.baseurl | prepend: site.url }}&description=" target="_blank" title="{{ site.theme_settings.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>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.pocket %}
+        <li>
+            <a href="https://getpocket.com/save?url={{ page.url | prepend: site.baseurl | prepend: site.url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}" target="_blank" title="{{ site.theme_settings.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>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.reddit %}
+        <li>
+            <a href="http://www.reddit.com/submit?url={{ page.url | prepend: site.baseurl | prepend: site.url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}" target="_blank" title="{{ site.theme_settings.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>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.linkedin %}
+        <li>
+            <a href="http://www.linkedin.com/shareArticle?mini=true&url={{ page.url | prepend: site.baseurl | prepend: site.url }}&title={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&summary=&source={{ page.url | prepend: site.baseurl | prepend: site.url }}" target="_blank" title="{{ site.theme_settings.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>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.wordpress %}
+        <li>
+            <a href="http://wordpress.com/press-this.php?u={{ page.url | prepend: site.baseurl | prepend: site.url }}&quote={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&s=" target="_blank" title="{{ site.theme_settings.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>
+		</a>
+        </li>
+        {% endif %} {% if site.theme_settings.share_buttons.email %}
+        <li>
+            <a href="mailto:?subject={{ page.title | url_encode }}%20%7C%20{{ site.title | url_encode }}&body=:%20{{ page.url | prepend: site.baseurl | prepend: site.url }}" target="_blank" title="{{ site.theme_settings.str_email }}">
+			<i class="fa fa-envelope-square fa-2x" aria-hidden="true"></i>
+			<span class="sr-only">{{ site.theme_settings.str_email }}</span>
+		</a>
+        </li>
+        {% endif %}
+    </ul>
+</div>

data/_includes/tags_list.html

@@ -1,16 +1,16 @@
 {% assign tags = include.tags | split:'|' | sort | uniq %}
 
-{% if include.tags.size > 0 %}
+{% if tags.size > 0 %}
 <footer>
   <div class="tag-list">
-    {% if include.tags.size == 1 %}
+    {% if tags.size == 1 %}
       <div class="meta">Tag</div>
-    {% elsif include.tags.size > 1 %}
+    {% else %}
       <div class="meta">Tags</div>
     {% endif %}
 
     {% for tag in tags %}
-    <a class="button" href="{{site.baseurl}}/tags#{{tag}}">
+    <a class="button" href="{{site.baseurl}}/tags#{{ tag | cgi_escape }}">
       <p><i class="fa fa-tag fa-fw"></i> {{ tag }}</p>
     </a>
     {% endfor %}

data/_layouts/custom.html

@@ -0,0 +1,35 @@
+---
+layout: default
+---
+<article {% if page.feature-img %}class="feature-image"{% endif %} style="padding:0;">
+  <header id="main" style="background-image: url('{{ site.baseurl }}/{{ page.feature-img }}')">
+    <h1 id="{{ page.title | cgi_escape }}" class="title">{{ page.title }}</h1>
+    <p class="meta">
+    {{ page.date | date: "%B %-d, %Y" }}
+    {% if page.author %} - {{ page.author }}{% endif %}
+    </p>
+  </header>
+  <section class="post-content">{{ content }}</section>
+  
+  <div style="display: inline-block;">
+  <!-- Social media shares -->
+  {% include share_buttons.html %}
+   
+   <!-- Tag list -->
+  {% capture tag_list %}{{ page.tags | join: "|"}}{% endcapture %}
+  {% include tags_list.html tags=tag_list %}
+    </div>
+      
+</article>
+
+<!-- Disqus -->
+{% if site.theme_settings.disqus_shortname %}
+<div class="comments">
+  {% include disqus.html %}
+</div>
+{% endif %}
+
+<!-- Post navigation -->
+{% if site.theme_settings.post_navigation %}
+  {% include post_nav.html %}
+{% endif %}

data/_layouts/default.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   {% include head.html %}
   <body>
     {% include navbar.html %}

data/_layouts/home.html

@@ -4,57 +4,12 @@ layout: default
 
 <div class="home">
   {% if site.theme_settings.header_text %}
-  <div id="main" class="call-out"
-  style="background-image: url('{{ site.baseurl }}/{{ site.theme_settings.header_text_feature_image }}')">
+  <div id="main" class="call-out" 
+       style="background-image: url('{{ site.baseurl }}/{{ site.theme_settings.header_feature_image }}')">
     {{ site.theme_settings.header_text }}
   </div>
   {% endif %}
 
-  <div class="posts">
-    {% for post in paginator.posts %}
-    <div class="post-teaser">
-      {% if post.thumbnail %} 
-      <div class="post-img">
-         <img src="{{ site.baseurl }}/{{ post.thumbnail }}">
-      </div>
-      {% endif %}
-      <span>
-          <header>
-            <h1>
-              <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">
-                {{ post.title }}
-              </a>
-            </h1>
-            <p class="meta">
-              {{ post.date | date: "%B %-d, %Y" }}
-            </p>
-          </header>
-          <div class="excerpt">
-              {{ post.excerpt | strip_html | escape }}
-            <!--{{ post.content | strip_html | truncate: "250" }}-->
-            <!--<a class="button" href="{{ post.url | prepend: site.baseurl }}">
-              {{ site.theme_settings.str_continue_reading }}
-            </a>-->
-          </div>
-      </span>
-    </div>
-    {% endfor %}
-  </div>
-
-  {% if paginator.total_pages > 1 %}
-  <div class="pagination">
-    {% if paginator.previous_page %}
-    <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="button" >
-      <i class="fa fa-chevron-left"></i>
-      {{ site.theme_settings.str_previous_page }}
-    </a>
-    {% endif %}
-    {% if paginator.next_page %}
-    <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="button" >
-      {{ site.theme_settings.str_next_page }}
-      <i class="fa fa-chevron-right"></i>
-    </a>
-    {% endif %}
-  </div>
-  {% endif %}
+  {% include blog.html %}
+    
 </div>