type-on-strap 1.5.0 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 68fbc05ebf76280282dac37718f941cbdce3c1b768a174f29222f3413178f751
4
- data.tar.gz: a9fcbffee5c308eea9236780ac63a1a8212860f48f10f564cc2b78b743cc7a5d
3
+ metadata.gz: a82252f722dbaa499c9b88862b7bf015b4e9e433065626b0986db18f05330c3c
4
+ data.tar.gz: '049c3c0e3a27975140f120ad01305071d2aaf7449678ae0019df49dd9eb74bc3'
5
5
  SHA512:
6
- metadata.gz: b79da2305dae68ec07ebabfd36b0382ef174c094ae9f0c1309605710c93cff79441f5346c73961825bceeb369d5e659b7825a19f8671fbaae91af946d2c38475
7
- data.tar.gz: 3f66b7a9e236d652cc3ef1df4c0d2198cb4d557ce0c14624d9f8aeb927165996d83ef4f0ca00928fad52580fc31138efa6f5d823d7aa80791108c7074ec4ab37
6
+ metadata.gz: d965f661f21023b6146578872761576f861476a97109bf9e81d9d3e1afd28aa01691b72a3f86bef8ca47a47137d0718553f58c5bad707917e658516a95576701
7
+ data.tar.gz: 8d85707b6cdb8cb4c93bae5188b2c1bd6b4acaa7312785fec5fac7248f9ca543b09a78b99afd64ab1fa965619634ede40d74fdaba722f97681a28365c4ecf9b6
data/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2017 Sylhare
3
+ Copyright (c) 2016-2019 Sylhare
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
data/README.md CHANGED
@@ -16,7 +16,7 @@ A free and open-source [Jekyll](https://jekyllrb.com) theme. Based on Rohan Chan
16
16
  * Syntax Highlighting: Easily customisable [Base16](https://github.com/chriskempson/base16)
17
17
  * Free of rights images from [pexels](https://www.pexels.com/)
18
18
 
19
- > [Demo](https://sylhare.github.io/Type-on-Strap/)
19
+ > [Demo Site](https://sylhare.github.io/Type-on-Strap/)
20
20
 
21
21
  [![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/)
22
22
 
@@ -33,12 +33,18 @@ A free and open-source [Jekyll](https://jekyllrb.com) theme. Based on Rohan Chan
33
33
 
34
34
  ## Usage
35
35
 
36
+ ### As a ruby gem
37
+
38
+ Check out this tutorial: [Use Type on strap as a gem](https://github.com/sylhare/Type-on-Strap/tree/v2#use-as-ruby-gem)
39
+
40
+ ### As a github page
41
+
36
42
  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`
37
43
  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.
38
44
  3. Install the theme's dependencies: `bundle install`
39
45
  4. Customize the theme
40
46
  - Github Page: [update `_config.yml`](https://github.com/Sylhare/Type-on-Strap#site-configuration)
41
- 5. Run the Jekyll server: `jekyll serve`
47
+ 5. Run the Jekyll server: `bundle exec jekyll serve`
42
48
 
43
49
  ## Structure
44
50
 
@@ -63,7 +69,7 @@ jekyll-theme-basically-basic
63
69
  | ├── gallery.md # Gallery page for your photos
64
70
  | ├── portfolio.md # Portfolio page for your projects
65
71
  | ├── search.html # Search page
66
- | └── tags.md # The tag page
72
+ | └── tags.md # The tag page
67
73
  ├── _config.yml # sample configuration
68
74
  └── index.html # sample home page (blog page paginated)
69
75
  ```
@@ -81,15 +87,15 @@ Configure Jekyll as your own blog or with a subpath in in `_config.yml`:
81
87
  Jekyll website *without* a subpath (such as a GitHub Pages website for a given username):
82
88
 
83
89
  ```yml
84
- baseurl: ""
85
- url: "https://username.github.io"
90
+ baseurl: ""
91
+ url: "https://username.github.io"
86
92
  ```
87
93
 
88
94
  Jekyll website *with* subpath (like the Type on Strap [demo](https://sylhare.github.io/Type-on-Strap/) page):
89
95
 
90
96
  ```yml
91
- baseurl: "/sub-directory"
92
- url: "https://username.github.io/"
97
+ baseurl: "/sub-directory"
98
+ url: "https://username.github.io/"
93
99
  ```
94
100
 
95
101
  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.
102
108
  Change these variables in `_config.yml`:
103
109
 
104
110
  ```yml
105
- theme_settings:
106
- title: My Jekyll Blog # Name of website
107
- avatar: assets/img/triangle.png # Path of avatar image, to be displayed in the theme's header
108
- description: My blog posts # Short description, primarily used by search engines
111
+ title: My Jekyll Blog # Name of website
112
+ avatar: assets/img/triangle.png # Path of avatar image, to be displayed in the theme's header
113
+ description: My blog posts # Short description, primarily used by search engines
114
+ favicon: assets/favicon.ico # Icon displayed in the tab
109
115
  ```
110
116
 
111
- ### Customizing text
117
+ ### Main configuration
112
118
 
113
119
  #### Footer and Header's text
114
120
 
115
121
  Customize your site header/footer with these variables in `_config.yml`:
116
122
 
117
123
  ```yml
118
- theme_settings:
119
- header_text: Welcome to my Jekyll blog
120
- header_feature_image: assets/img/sample3.png
121
- footer_text: Copyright 2017
124
+ header_text: Welcome to my Jekyll blog
125
+ header_feature_image: assets/img/sample3.png
126
+ footer_text: Copyright 2017
122
127
  ```
123
128
 
124
129
  If you don't want anything, replace the value by `" "`.
125
130
 
126
131
  #### Localisation string
127
132
 
128
- Change localization string variables in `_config.yml`.
129
-
130
- English text used in the theme has been grouped so you can quickly translate the theme or change labels to suit your needs.
131
-
132
- ```yml
133
- theme_settings:
134
- str_follow_on: "Follow on"
135
- str_rss_follow: "Follow RSS feed"
136
- str_email: "Email"
137
- str_next_post: "Next post"
138
- str_previous_post: "Previous post"
139
- str_next_page: "Next"
140
- str_previous_page: "Prev"
141
- str_continue_reading: "Continue reading"
142
- str_javascript_required_disqus: "Please enable JavaScript to view comments."
143
- ```
144
-
145
-
146
- ### Other features
147
-
148
- Jekyll works with [liquid](https://shopify.github.io/liquid/) tags usually represented by:
133
+ Localization string is a way to quickly change the template language for text like *Next Post* or *Follow on*, ...
134
+ You can find all the properties in `_data/language.yml`.
149
135
 
150
- ```
151
- {{ liquid.tag | filter }}
152
- ```
136
+ By default it is in english, but you can easily add your own language.
153
137
 
154
- These are useful to render your jekyll files.
155
- You can learn more about them on [shopify's doc](https://help.shopify.com/themes/liquid/basics)
156
-
157
- ### Footer's icons
138
+ ### Google Analytics
158
139
 
159
- Display the site's icon from [Font Awesome](https://fortawesome.github.io/Font-Awesome/) in the footer.
160
- All icon variables should be your username enclosed in quotes (e.g. "username") in `_config.yml`,
161
- except for the following variables:
140
+ To enable Google Analytics, add your [tracking ID](https://support.google.com/analytics/answer/1032385)
141
+ to `_config.yml` like so:
162
142
 
163
143
  ```yml
164
- theme_settings:
165
- rss: true # Make sure you created a feed.xml with feed.xml layout
166
- email_address: type@example.com
167
- linkedin: https://www.linkedin.com/in/FirstLast
168
- stack_exchange: https://stackoverflow.com/users/0000/first-last
144
+ google_analytics: UA-NNNNNNNN-N
169
145
  ```
170
146
 
171
147
  ### Comments (via Disqus)
@@ -177,18 +153,7 @@ To enable Disqus comments, add your [Disqus shortname](https://help.disqus.com/c
177
153
  to your project's `_config.yml` file:
178
154
 
179
155
  ```yml
180
- theme_settings:
181
- disqus_shortname: my_disqus_shortname
182
- ```
183
-
184
- ### Google Analytics
185
-
186
- To enable Google Analytics, add your [tracking ID](https://support.google.com/analytics/answer/1032385)
187
- to `_config.yml` like so:
188
-
189
- ```yml
190
- theme_settings:
191
- google_analytics: UA-NNNNNNNN-N
156
+ disqus_shortname: my_disqus_shortname
192
157
  ```
193
158
 
194
159
  ### Math typesetting
@@ -196,8 +161,7 @@ to `_config.yml` like so:
196
161
  When KateX is set in `_config.yml`:
197
162
 
198
163
  ```yml
199
- theme_settings:
200
- katex: true # to Enable it
164
+ katex: true # to Enable it
201
165
  ```
202
166
 
203
167
  You can then wrap math expressions with `$$` signs in your posts and make sure you have set the `katex` variable
@@ -217,30 +181,38 @@ $$
217
181
  $$
218
182
  ```
219
183
 
220
- ### Post excerpt
184
+ ### Social icons
221
185
 
222
- The [excerpt](https://jekyllrb.com/docs/posts/#post-excerpts) are the first lines of an article that is display on the blog page.
223
- The length of the excerpt has a default of around `250` characters and can be manually set in the post using:
186
+ In `_data/social.yml` you can customize the social icons from other wbesite you wish to display in the blog.
187
+ The site icons come from [Font Awesome](https://fortawesome.github.io/Font-Awesome/).
224
188
 
225
- ```yml
226
- ---
227
- layout: post
228
- title: Sample Page
229
- excerpt_separator: <!--more-->
230
- ---
189
+ #### Share in article
231
190
 
232
- some text in the excerpt
233
- <!--more-->
234
- ... rest of the text not shown in the excerpt ...
191
+ The share icons are the one at the bottom of the blog page if enabled,
192
+ to share the article on those platform.
193
+
194
+
195
+ #### Footer
196
+
197
+ Display in the footer.
198
+ All icon variables should be your username enclosed in quotes (e.g. "username") in `_config.yml`,
199
+ except for the following variables:
200
+
201
+ ```yml
202
+ rss: true # Make sure you created a feed.xml with feed.xml layout
203
+ email_address: type@example.com
204
+ linkedin: https://www.linkedin.com/in/FirstLast
205
+ stack_exchange: https://stackexchangecom/users/0000/first-last
206
+ stack_overflow: https://stackoverflow.com/users/0000/first-last
235
207
  ```
236
208
 
237
- The html is stripped out of the excerpt so it only display text.
209
+ ### Customizing Posts
238
210
 
239
- ## Layout
240
- Please refer to the [Jekyll docs for writing posts](https://jekyllrb.com/docs/posts/).
241
- Non-standard features are documented below.
211
+ When writing a post, be sure in jekyll to:
212
+ - Put it in the `_posts` folder
213
+ - Name it with the date first like `2019-08-21-This-is-my-blog-post.md`
242
214
 
243
- ### Layout: Post
215
+ #### Layout: Post
244
216
 
245
217
  This are the basic features you can use with the `post` layout.
246
218
 
@@ -258,14 +230,37 @@ tags: [sample, markdown, html]
258
230
  ```
259
231
 
260
232
  With `thumbnail`, you can add a smaller image than the `feature-img`.
261
- If you don't want/have a thumbnail you can still use the same image as the feature one.
233
+ If you don't have a thumbnail you can still use the same image as the feature one.
262
234
 
263
235
  The background used when `color` is set comes from `lineart.png` from [xukimseven](https://github.com/xukimseven)
264
- you can edit it in the config file (`theme_settings > color_image`). If you want another one, put it in `/assets/img` as well.
236
+ you can edit it in the config file (`_config.yml > color_image`). If you want another one, put it in `/assets/img` as well.
265
237
 
266
238
  The **bootstrap** is not mandatory and is only useful if you want to add bootstrapped content in your page.
267
239
  It will respect the page and theme layout, mind the padding on the sides.
268
240
 
241
+ #### Post excerpt
242
+
243
+ The [excerpt](https://jekyllrb.com/docs/posts/#post-excerpts) are the first lines of an article that is display on the blog page.
244
+ The length of the excerpt has a default of around `250` characters and can be manually set in the post using:
245
+
246
+ ```yml
247
+ ---
248
+ layout: post
249
+ title: Sample Page
250
+ excerpt_separator: <!--more-->
251
+ ---
252
+
253
+ some text in the excerpt
254
+ <!--more-->
255
+ ... rest of the text not shown in the excerpt ...
256
+ ```
257
+
258
+ The html is stripped out of the excerpt so it only display text.
259
+
260
+ ## Other Layouts
261
+ Please refer to the [Jekyll docs for writing posts](https://jekyllrb.com/docs/posts/).
262
+ Non-standard features are documented below.
263
+
269
264
  ### Layout: Page
270
265
 
271
266
  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
335
330
  ---
336
331
  ```
337
332
 
333
+ #### Portfolio in gem
334
+
335
+ Make sure your `_config.yml` contains the following if you are using the theme as a gem:
336
+
337
+ ```yml
338
+
339
+ # PORTFOLIO
340
+ collections:
341
+ portfolio:
342
+ output: true
343
+ permalink: /:collection/:name
344
+ ```
345
+
346
+ This creates the collection for Jekyll so it can find and display your portfolio posts.
347
+
338
348
  ### Gallery
339
349
 
340
350
  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]
390
400
  All the tags will be listed in `tags.html` with a link toward the pages or posts.
391
401
  The Tag page can be hidden with the `hide` option. You can remove the icon by removing `icon` (like for the search page).
392
402
 
393
- ## Template as a Gem
403
+ ## Advanced
394
404
 
395
- You can use Type-on-strap as a [gem](https://rubygems.org/gems/type-on-strap).
396
- Checkout an example in the [gem-demo branch](https://github.com/Sylhare/Type-on-Strap/tree/gem-demo).
397
- To make the feature pages available in from the gem I created them as layouts that can be invoked in the pages folder.
405
+ ### Liquid tags
398
406
 
399
- So if you're using the template as a theme, Make sure you have:
400
- - A `index.html` file
401
- - The right `_config.yml` with the theme setting such as `theme: type-on-strap` uncommented
402
- - The feature page included. (ex: as it is already in `pages`)
403
- - Some content ready in `_posts` and `_portfolio` to be displayed
407
+ Jekyll works with [liquid](https://shopify.github.io/liquid/) tags usually represented by:
404
408
 
405
- 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)
409
+ ```
410
+ {{ liquid.tag | filter }}
411
+ ```
406
412
 
407
- ## Advanced
413
+ These are useful to render your jekyll files.
414
+ You can learn more about them on [shopify's doc](https://help.shopify.com/themes/liquid/basics)
408
415
 
409
416
  ### Minimizing and optimizing: css, js and images
410
417
 
@@ -428,6 +435,43 @@ gulp default
428
435
  git status
429
436
  ```
430
437
 
438
+ ### Use as Ruby Gem
439
+
440
+ You can use Type-on-strap as a [gem](https://rubygems.org/gems/type-on-strap).
441
+
442
+ Ruby Gem Method
443
+ Add this line to your Jekyll site's Gemfile (or create one):
444
+
445
+ ```ruby
446
+ gem "type-on-strap"
447
+ ```
448
+ Add this line to your Jekyll site's `_config.yml` file:
449
+
450
+ ```yml
451
+ theme: type-on-strap
452
+ ```
453
+
454
+ Then run Bundler to install the theme gem and dependencies:
455
+
456
+ ```bash
457
+ bundle install
458
+ ```
459
+
460
+ Then you can start adding content like:
461
+ - Add a `index.html` file
462
+ - Add the feature page you want. (ex: as it is already in `pages`)
463
+ - Add posts in `_posts` and `_portfolio` to be displayed
464
+
465
+
466
+ ### Remote Theme
467
+
468
+ 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).
469
+ For that remove all `theme:` attributes from `_config.yml` and add instead:
470
+
471
+ ```yml
472
+ remote_theme: sylhare/Type-on-Strap
473
+ ```
474
+
431
475
  ## License
432
476
 
433
477
  There are some fonts and component on this theme going under the MIT licence as well in this theme.
@@ -0,0 +1,13 @@
1
+ # Localization strings
2
+ str_follow_on: "Follow on"
3
+ str_rss_follow: "Follow RSS feed"
4
+ str_share_on: "Share on"
5
+ str_add_to: "Add to"
6
+ str_email: "Email"
7
+ str_tweet: "Tweet"
8
+ str_pin_it: "Pin it"
9
+ str_next_post: "Next post"
10
+ str_previous_post: "Previous post"
11
+ str_next_page: "Next"
12
+ str_previous_page: "Prev"
13
+ str_javascript_required_disqus: "Please enable JavaScript to view comments."
data/_includes/blog.html CHANGED
@@ -15,11 +15,11 @@
15
15
  {{ post.title }}
16
16
  </a>
17
17
  </h1>
18
- {% include post_info.html post=post %}
18
+ {% include post_info.html author=post.author date=post.date %}
19
19
  </header>
20
- {% if site.theme_settings.excerpt %}
20
+ {% if site.excerpt or site.theme_settings.excerpt %}
21
21
  <div class="excerpt">
22
- {% if site.theme_settings.excerpt == "truncate" %}
22
+ {% if site.excerpt == "truncate" %}
23
23
  {{ post.content | strip_html | truncate: '250' | escape }}
24
24
  {% else %}
25
25
  {{ post.excerpt | strip_html | escape }}
@@ -4,16 +4,16 @@
4
4
 
5
5
  {% if paginator.previous_page and paginator.previous_page != 1%}
6
6
  <!-- << -->
7
- <a aria-label="{{ site.theme_settings.str_previous_page }}" href="{{ '/' | relative_url }}" class="button">
7
+ <a aria-label="{{ site.data.language.str_previous_page | default: 'Prev' }}" href="{{ '/' | relative_url }}" class="button">
8
8
  <span><i class="fa fa-angle-double-left"></i></span>
9
9
  </a>
10
10
  {% endif %}
11
11
 
12
12
  <!-- < previous -->
13
- <a aria-label="{{ site.theme_settings.str_previous_page }}" href="{{ paginator.previous_page_path | relative_url }}"
13
+ <a aria-label="{{ site.data.language.str_previous_page | default: 'Prev' }}" href="{{ paginator.previous_page_path | relative_url }}"
14
14
  {% unless paginator.previous_page %}style="visibility:hidden"{% endunless %} class="button">
15
15
  <span><i class="fa fa-chevron-left"></i></span>
16
- {{ site.theme_settings.str_previous_page }}
16
+ {{ site.data.language.str_previous_page | default: "Prev" }}
17
17
  </a>
18
18
  </div>
19
19
 
@@ -24,15 +24,16 @@
24
24
  <div class="next">
25
25
 
26
26
  <!-- next > -->
27
- <a aria-label="{{ site.theme_settings.str_next_page }}" href="{{ paginator.next_page_path | relative_url }}"
27
+ <a aria-label="{{ site.data.language.str_next_page | default: 'Next' }}" href="{{ paginator.next_page_path | relative_url }}"
28
28
  {% unless paginator.next_page %}style="visibility:hidden"{% endunless %} class="button">
29
- {{ site.theme_settings.str_next_page }}
29
+ {{ site.data.language.str_next_page | default: "Next" }}
30
30
  <span><i class="fa fa-chevron-right"></i></span>
31
31
  </a>
32
32
 
33
33
  {% if paginator.next_page and paginator.next_page != paginator.total_pages %}
34
34
  <!-- >> -->
35
- <a aria-label="{{ site.theme_settings.str_next_page }}" href="{{ site.paginate_path | relative_url | replace: ':num', paginator.total_pages }}" class="button">
35
+ <a aria-label="{{ site.data.language.str_next_page | default: 'Next' }}"
36
+ href="{{ site.paginate_path | relative_url | replace: ':num', paginator.total_pages }}" class="button">
36
37
  <span><i class="fa fa-angle-double-right"></i></span>
37
38
  </a>
38
39
  {% endif %}
@@ -1,10 +1,10 @@
1
1
  <div id="disqus_thread"></div>
2
2
  <script type="text/javascript">
3
- var disqus_shortname = '{{ site.theme_settings.disqus_shortname }}';
3
+ var disqus_shortname = '{{ site.disqus_shortname }}';
4
4
  (function() {
5
5
  var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
6
6
  dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
7
7
  (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
8
8
  })();
9
9
  </script>
10
- <noscript>{{ site.theme_settings.str_javascript_required_disqus }}</noscript>
10
+ <noscript>{{ site.data.language.str_javascript_required_disqus | default: Please enable JavaScript to view comments." }}</noscript>
@@ -1,6 +1,6 @@
1
1
  <footer class="site-footer">
2
2
  <p class="text">
3
- {{ 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>
3
+ {{ 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>
4
4
  <div class="footer-icons">
5
5
  <ul>
6
6
  <!-- Social icons from Font Awesome, if enabled -->
data/_includes/head.html CHANGED
@@ -9,7 +9,7 @@
9
9
  <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
10
10
 
11
11
  <!--Favicon-->
12
- <link rel="shortcut icon" href="{{ site.theme_settings.favicon | relative_url }}" type="image/x-icon">
12
+ <link rel="shortcut icon" href="{{ site.favicon | relative_url }}" type="image/x-icon">
13
13
 
14
14
  <!-- Canonical -->
15
15
  <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
@@ -31,26 +31,26 @@
31
31
 
32
32
  <!-- KaTeX 0.8.3 -->
33
33
  <!-- if you have any issue check https://github.com/KaTeX/KaTeX -->
34
- {% if site.theme_settings.katex %}
34
+ {% if site.katex or site.theme_settings.katex %}
35
35
  <script src="{{ '/assets/js/vendor/katex.min.js' | relative_url }}"></script>
36
36
  {% endif %}
37
37
 
38
38
  <!-- Google Analytics -->
39
- {% if site.theme_settings.google_analytics %}
39
+ {% if site.google_analytics %}
40
40
  <!-- Global site tag (gtag.js) -->
41
- <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.theme_settings.google_analytics }}"></script>
41
+ <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
42
42
  <script>
43
43
  window.dataLayer = window.dataLayer || [];
44
44
  function gtag(){dataLayer.push(arguments);}
45
45
  gtag('js', new Date());
46
- gtag('config', '{{ site.theme_settings.google_analytics }}');
46
+ gtag('config', '{{ site.google_analytics }}');
47
47
  </script>
48
48
 
49
49
  <!-- Page analysis (analytics.js) -->
50
50
  <script async src='https://www.google-analytics.com/analytics.js'></script>
51
51
  <script>
52
52
  window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
53
- ga('create', '{{ site.theme_settings.google_analytics }}', 'auto');
53
+ ga('create', '{{ site.google_analytics }}', 'auto');
54
54
  ga('send', 'pageview');
55
55
  </script>
56
56
  {% endif %} <!-- End Google Analytics -->
@@ -60,6 +60,6 @@
60
60
  <!-- Manual seo tags -->
61
61
  <!--
62
62
  <title>{% if page.title %}{{ page.title }} |{% endif %} {{ site.title }}</title>
63
- <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.theme_settings.description }}{% endif %}">
63
+ <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
64
64
  -->
65
65
  </head>
data/_includes/icons.html CHANGED
@@ -1,6 +1,6 @@
1
- {% if site.theme_settings.rss %}
1
+ {% if site.data.social.rss or site.theme_settings.rss %}
2
2
  <li>
3
- <a href="{{ "feed.xml" | absolute_url }}" title="{{ site.theme_settings.str_rss_follow }}">
3
+ <a href="{{ "feed.xml" | absolute_url }}" title="{{ site.data.language.str_rss_follow | default: "Follow RSS feed" }}">
4
4
  <span class="fa-stack fa-lg">
5
5
  <i class="fa fa-circle fa-stack-2x"></i>
6
6
  <i class="fa fa-rss fa-stack-1x fa-inverse"></i>
@@ -9,9 +9,9 @@
9
9
  </li>
10
10
  {% endif %}
11
11
 
12
- {% if site.theme_settings.email_address %}
12
+ {% if site.data.social.email_address or site.theme_settings.email_address %}
13
13
  <li>
14
- <a href="mailto:{{ site.theme_settings.email_address }}" title="{{ site.theme_settings.str_email }}">
14
+ <a href="mailto:{{ site.data.social.email_address }}" title="{{ site.data.language.str_email }}">
15
15
  <span class="fa-stack fa-lg">
16
16
  <i class="fa fa-circle fa-stack-2x"></i>
17
17
  <i class="fa fa-envelope fa-stack-1x fa-inverse"></i>
@@ -20,9 +20,9 @@
20
20
  </li>
21
21
  {% endif %}
22
22
 
23
- {% if site.theme_settings.behance %}
23
+ {% if site.data.social.behance or site.theme_settings.behance %}
24
24
  <li>
25
- <a href="https://www.behance.net/{{ site.theme_settings.behance }}" title="{{ site.theme_settings.str_follow_on }} Behance">
25
+ <a href="https://www.behance.net/{{ site.data.social.behance }}" title="{{ site.data.language.str_follow_on }} Behance">
26
26
  <span class="fa-stack fa-lg">
27
27
  <i class="fa fa-circle fa-stack-2x"></i>
28
28
  <i class="fa fa-behance fa-stack-1x fa-inverse"></i>
@@ -31,9 +31,9 @@
31
31
  </li>
32
32
  {% endif %}
33
33
 
34
- {% if site.theme_settings.bitbucket %}
34
+ {% if site.data.social.bitbucket or site.theme_settings.bitbucket %}
35
35
  <li>
36
- <a href="https://bitbucket.org/{{ site.theme_settings.bitbucket }}" title="{{ site.theme_settings.str_follow_on }} Bitbucket">
36
+ <a href="https://bitbucket.org/{{ site.data.social.bitbucket }}" title="{{ site.data.language.str_follow_on }} Bitbucket">
37
37
  <span class="fa-stack fa-lg">
38
38
  <i class="fa fa-circle fa-stack-2x"></i>
39
39
  <i class="fa fa-bitbucket fa-stack-1x fa-inverse"></i>
@@ -42,9 +42,9 @@
42
42
  </li>
43
43
  {% endif %}
44
44
 
45
- {% if site.theme_settings.dribbble %}
45
+ {% if site.data.social.dribbble or site.theme_settings.dribbble %}
46
46
  <li>
47
- <a href="https://dribbble.com/{{ site.theme_settings.dribbble }}" title="{{ site.theme_settings.str_follow_on }} Dribbble">
47
+ <a href="https://dribbble.com/{{ site.data.social.dribbble }}" title="{{ site.data.language.str_follow_on }} Dribbble">
48
48
  <span class="fa-stack fa-lg">
49
49
  <i class="fa fa-circle fa-stack-2x"></i>
50
50
  <i class="fa fa-dribbble fa-stack-1x fa-inverse"></i>
@@ -53,9 +53,9 @@
53
53
  </li>
54
54
  {% endif %}
55
55
 
56
- {% if site.theme_settings.facebook %}
56
+ {% if site.data.social.facebook or site.theme_settings.facebook %}
57
57
  <li>
58
- <a href="https://www.facebook.com/{{ site.theme_settings.facebook }}" title="{{ site.theme_settings.str_follow_on }} Facebook">
58
+ <a href="https://www.facebook.com/{{ site.data.social.facebook }}" title="{{ site.data.language.str_follow_on }} Facebook">
59
59
  <span class="fa-stack fa-lg">
60
60
  <i class="fa fa-circle fa-stack-2x"></i>
61
61
  <i class="fa fa-facebook fa-stack-1x fa-inverse"></i>
@@ -64,9 +64,9 @@
64
64
  </li>
65
65
  {% endif %}
66
66
 
67
- {% if site.theme_settings.flickr %}
67
+ {% if site.data.social.flickr or site.theme_settings.flickr %}
68
68
  <li>
69
- <a href="https://www.flickr.com/photos/{{ site.theme_settings.flickr }}" title="{{ site.theme_settings.str_follow_on }} Flickr">
69
+ <a href="https://www.flickr.com/photos/{{ site.data.social.flickr }}" title="{{ site.data.language.str_follow_on }} Flickr">
70
70
  <span class="fa-stack fa-lg">
71
71
  <i class="fa fa-circle fa-stack-2x"></i>
72
72
  <i class="fa fa-flickr fa-stack-1x fa-inverse"></i>
@@ -75,9 +75,9 @@
75
75
  </li>
76
76
  {% endif %}
77
77
 
78
- {% if site.theme_settings.github %}
78
+ {% if site.data.social.github or site.theme_settings.github %}
79
79
  <li>
80
- <a href="https://github.com/{{ site.theme_settings.github }}" title="{{ site.theme_settings.str_follow_on }} GitHub">
80
+ <a href="https://github.com/{{ site.data.social.github }}" title="{{ site.data.language.str_follow_on }} GitHub">
81
81
  <span class="fa-stack fa-lg">
82
82
  <i class="fa fa-circle fa-stack-2x"></i>
83
83
  <i class="fa fa-github fa-stack-1x fa-inverse"></i>
@@ -86,9 +86,9 @@
86
86
  </li>
87
87
  {% endif %}
88
88
 
89
- {% if site.theme_settings.instagram %}
89
+ {% if site.data.social.instagram or site.theme_settings.instagram %}
90
90
  <li>
91
- <a href="http://instagram.com/{{ site.theme_settings.instagram }}" title="{{ site.theme_settings.str_follow_on }} Instagram">
91
+ <a href="http://instagram.com/{{ site.data.social.instagram }}" title="{{ site.data.language.str_follow_on }} Instagram">
92
92
  <span class="fa-stack fa-lg">
93
93
  <i class="fa fa-circle fa-stack-2x"></i>
94
94
  <i class="fa fa-instagram fa-stack-1x fa-inverse"></i>
@@ -97,9 +97,9 @@
97
97
  </li>
98
98
  {% endif %}
99
99
 
100
- {% if site.theme_settings.keybase %}
100
+ {% if site.data.social.keybase or site.theme_settings.keybase %}
101
101
  <li>
102
- <a href="https://keybase.io/{{ site.theme_settings.keybase }}" title="{{ site.theme_settings.str_follow_on }} Keybase">
102
+ <a href="https://keybase.io/{{ site.data.social.keybase }}" title="{{ site.data.language.str_follow_on }} Keybase">
103
103
  <span class="fa-stack fa-lg">
104
104
  <i class="fa fa-circle fa-stack-2x"></i>
105
105
  <i class="fa fa-key fa-stack-1x fa-inverse"></i>
@@ -108,9 +108,9 @@
108
108
  </li>
109
109
  {% endif %}
110
110
 
111
- {% if site.theme_settings.linkedin %}
111
+ {% if site.data.social.linkedin or site.theme_settings.linkedin %}
112
112
  <li>
113
- <a href="{{ site.theme_settings.linkedin }}" title="{{ site.theme_settings.str_follow_on }} LinkedIn">
113
+ <a href="{{ site.data.social.linkedin }}" title="{{ site.data.language.str_follow_on }} LinkedIn">
114
114
  <span class="fa-stack fa-lg">
115
115
  <i class="fa fa-circle fa-stack-2x"></i>
116
116
  <i class="fa fa-linkedin fa-stack-1x fa-inverse"></i>
@@ -119,9 +119,9 @@
119
119
  </li>
120
120
  {% endif %}
121
121
 
122
- {% if site.theme_settings.pinterest %}
122
+ {% if site.data.social.pinterest or site.theme_settings.pinterest %}
123
123
  <li>
124
- <a href="http://www.pinterest.com/{{ site.theme_settings.pinterest }}" title="{{ site.theme_settings.str_follow_on }} Pinterest">
124
+ <a href="http://www.pinterest.com/{{ site.data.social.pinterest }}" title="{{ site.data.language.str_follow_on }} Pinterest">
125
125
  <span class="fa-stack fa-lg">
126
126
  <i class="fa fa-circle fa-stack-2x"></i>
127
127
  <i class="fa fa-pinterest fa-stack-1x fa-inverse"></i>
@@ -130,9 +130,9 @@
130
130
  </li>
131
131
  {% endif %}
132
132
 
133
- {% if site.theme_settings.reddit %}
133
+ {% if site.data.social.reddit or site.theme_settings.reddit %}
134
134
  <li>
135
- <a href="https://www.reddit.com/user/{{ site.theme_settings.reddit }}" title="{{ site.theme_settings.str_follow_on }} Reddit">
135
+ <a href="https://www.reddit.com/user/{{ site.data.social.reddit }}" title="{{ site.data.language.str_follow_on }} Reddit">
136
136
  <span class="fa-stack fa-lg">
137
137
  <i class="fa fa-circle fa-stack-2x"></i>
138
138
  <i class="fa fa-reddit fa-stack-1x fa-inverse"></i>
@@ -141,9 +141,9 @@
141
141
  </li>
142
142
  {% endif %}
143
143
 
144
- {% if site.theme_settings.soundcloud %}
144
+ {% if site.data.social.soundcloud or site.theme_settings.soundcloud %}
145
145
  <li>
146
- <a href="https://soundcloud.com/{{ site.theme_settings.soundcloud }}" title="{{ site.theme_settings.str_follow_on }} SoundCloud">
146
+ <a href="https://soundcloud.com/{{ site.data.social.soundcloud }}" title="{{ site.data.language.str_follow_on }} SoundCloud">
147
147
  <span class="fa-stack fa-lg">
148
148
  <i class="fa fa-circle fa-stack-2x"></i>
149
149
  <i class="fa fa-soundcloud fa-stack-1x fa-inverse"></i>
@@ -152,9 +152,9 @@
152
152
  </li>
153
153
  {% endif %}
154
154
 
155
- {% if site.theme_settings.stack_exchange %}
155
+ {% if site.data.social.stack_exchange or site.theme_settings.stack_exchange %}
156
156
  <li>
157
- <a href="{{ site.theme_settings.stack_exchange }}" title="{{ site.theme_settings.str_follow_on }} Stack Exchange">
157
+ <a href="{{ site.data.social.stack_exchange }}" title="{{ site.data.language.str_follow_on }} Stack Exchange">
158
158
  <span class="fa-stack fa-lg">
159
159
  <i class="fa fa-circle fa-stack-2x"></i>
160
160
  <i class="fa fa-stack-exchange fa-stack-1x fa-inverse"></i>
@@ -163,9 +163,9 @@
163
163
  </li>
164
164
  {% endif %}
165
165
 
166
- {% if site.theme_settings.stack_overflow %}
166
+ {% if site.data.social.stack_overflow or site.theme_settings.stack_overflow %}
167
167
  <li>
168
- <a href="{{ site.theme_settings.stack_overflow }}" title="{{ site.theme_settings.str_follow_on }} Stack Overflow">
168
+ <a href="{{ site.data.social.stack_overflow }}" title="{{ site.data.language.str_follow_on }} Stack Overflow">
169
169
  <span class="fa-stack fa-lg">
170
170
  <i class="fa fa-circle fa-stack-2x"></i>
171
171
  <i class="fa fa-stack-overflow fa-stack-1x fa-inverse"></i>
@@ -174,9 +174,9 @@
174
174
  </li>
175
175
  {% endif %}
176
176
 
177
- {% if site.theme_settings.steam %}
177
+ {% if site.data.social.steam or site.theme_settings.steam %}
178
178
  <li>
179
- <a href="http://steamcommunity.com/id/{{ site.theme_settings.steam }}" title="{{ site.theme_settings.str_follow_on }} Steam">
179
+ <a href="http://steamcommunity.com/id/{{ site.data.social.steam }}" title="{{ site.data.language.str_follow_on }} Steam">
180
180
  <span class="fa-stack fa-lg">
181
181
  <i class="fa fa-circle fa-stack-2x"></i>
182
182
  <i class="fa fa-steam fa-stack-1x fa-inverse"></i>
@@ -185,9 +185,9 @@
185
185
  </li>
186
186
  {% endif %}
187
187
 
188
- {% if site.theme_settings.tumblr %}
188
+ {% if site.data.social.tumblr or site.theme_settings.tumblr %}
189
189
  <li>
190
- <a href="http://{{ site.theme_settings.tumblr }}.tumblr.com/" title="{{ site.theme_settings.str_follow_on }} Tumblr">
190
+ <a href="http://{{ site.data.social.tumblr }}.tumblr.com/" title="{{ site.data.language.str_follow_on }} Tumblr">
191
191
  <span class="fa-stack fa-lg">
192
192
  <i class="fa fa-circle fa-stack-2x"></i>
193
193
  <i class="fa fa-tumblr fa-stack-1x fa-inverse"></i>
@@ -196,9 +196,9 @@
196
196
  </li>
197
197
  {% endif %}
198
198
 
199
- {% if site.theme_settings.gitlab %}
199
+ {% if site.data.social.gitlab or site.theme_settings.gitlab %}
200
200
  <li>
201
- <a href="https://gitlab.com/{{ site.theme_settings.gitlab }}" title="{{ site.theme_settings.str_follow_on }} Gitlab">
201
+ <a href="https://gitlab.com/{{ site.data.social.gitlab }}" title="{{ site.data.language.str_follow_on }} Gitlab">
202
202
  <span class="fa-stack fa-lg">
203
203
  <i class="fa fa-circle fa-stack-2x"></i>
204
204
  <i class="fa fa-gitlab fa-stack-1x fa-inverse"></i>
@@ -207,9 +207,9 @@
207
207
  </li>
208
208
  {% endif %}
209
209
 
210
- {% if site.theme_settings.twitter %}
210
+ {% if site.data.social.twitter or site.theme_settings.twitter %}
211
211
  <li>
212
- <a href="https://twitter.com/{{ site.theme_settings.twitter }}" title="{{ site.theme_settings.str_follow_on }} Twitter" class="type">
212
+ <a href="https://twitter.com/{{ site.data.social.twitter }}" title="{{ site.data.language.str_follow_on }} Twitter" class="type">
213
213
  <span class="fa-stack fa-lg">
214
214
  <i class="fa fa-circle fa-stack-2x"></i>
215
215
  <i class="fa fa-twitter fa-stack-1x fa-inverse"></i>
@@ -218,9 +218,9 @@
218
218
  </li>
219
219
  {% endif %}
220
220
 
221
- {% if site.theme_settings.vimeo %}
221
+ {% if site.data.social.vimeo or site.theme_settings.vimeo %}
222
222
  <li>
223
- <a href="https://vimeo.com/{{ site.theme_settings.vimeo }}" title="{{ site.theme_settings.str_follow_on }} Vimeo" class="type">
223
+ <a href="https://vimeo.com/{{ site.data.social.vimeo }}" title="{{ site.data.language.str_follow_on }} Vimeo" class="type">
224
224
  <span class="fa-stack fa-lg">
225
225
  <i class="fa fa-circle fa-stack-2x"></i>
226
226
  <i class="fa fa-vimeo fa-stack-1x fa-inverse"></i>
@@ -229,9 +229,9 @@
229
229
  </li>
230
230
  {% endif %}
231
231
 
232
- {% if site.theme_settings.wordpress %}
232
+ {% if site.data.social.wordpress or site.theme_settings.wordpress %}
233
233
  <li>
234
- <a href="https://{{ site.theme_settings.wordpress }}.wordpress.com/" title="{{ site.theme_settings.str_follow_on }} WordPress">
234
+ <a href="https://{{ site.data.social.wordpress }}.wordpress.com/" title="{{ site.data.language.str_follow_on }} WordPress">
235
235
  <span class="fa-stack fa-lg">
236
236
  <i class="fa fa-circle fa-stack-2x"></i>
237
237
  <i class="fa fa-wordpress fa-stack-1x fa-inverse"></i>
@@ -240,9 +240,9 @@
240
240
  </li>
241
241
  {% endif %}
242
242
 
243
- {% if site.theme_settings.youtube %}
243
+ {% if site.data.social.youtube or site.theme_settings.youtube %}
244
244
  <li>
245
- <a href="https://www.youtube.com/user/{{ site.theme_settings.youtube }}" title="{{ site.theme_settings.str_follow_on }} YouTube">
245
+ <a href="https://www.youtube.com/user/{{ site.data.social.youtube }}" title="{{ site.data.language.str_follow_on }} YouTube">
246
246
  <span class="fa-stack fa-lg">
247
247
  <i class="fa fa-circle fa-stack-2x"></i>
248
248
  <i class="fa fa-youtube fa-stack-1x fa-inverse"></i>
@@ -2,9 +2,9 @@
2
2
 
3
3
  <!-- Logo and title -->
4
4
  <div class="branding">
5
- {% if site.theme_settings.avatar %}
5
+ {% if site.avatar %}
6
6
  <a href="{{ '/' | relative_url }}">
7
- <img alt="logo img" class="avatar" src="{{ site.theme_settings.avatar | relative_url }}" />
7
+ <img alt="logo img" class="avatar" src="{{ site.avatar | relative_url }}" />
8
8
  </a>
9
9
  {% endif %}
10
10
 
@@ -1,22 +1,13 @@
1
- {%- assign author-id = include.post.author-id -%}
2
-
3
- {%- assign author_name = site.authors[author-id].name | default: author-id -%}
4
- {%- assign avatar = site.authors[author-id].avatar -%}
5
- {%- assign author_url = site.authors[author-id].url -%}
6
- {%- assign date = include.post.date -%}
7
- {%- if (author_url and (avatar or author_name)) -%}
8
- {%- assign render_url = true -%}
9
- {%- else -%}
10
- {%- assign render_url = false -%}
11
- {% endif %}
1
+ {% assign author = site.data.authors[include.author] %}
2
+ {% assign date = include.date %}
12
3
 
13
4
  <div class="post-info">
14
- {%- if render_url -%}<a href="{{ author_url | relative_url }}" target="_blank">{%- endif -%}
15
- {% if avatar %}
16
- <img src="{{ avatar | relative_url }}">
5
+ {%- if author.url -%}<a href="{{ author.url | relative_url }}" target="_blank">{%- endif -%}
6
+ {% if author.avatar %}
7
+ <img src="{{ author.avatar | relative_url }}">
17
8
  {% endif %}
18
9
  <p class="meta">
19
- {% if author_name %}{{ author_name }} - {% endif %}{{ date | date: "%B %-d, %Y" }}
10
+ {% if author.name %}{{ author.name }} - {% endif %}{{ date | date: "%B %-d, %Y" }}
20
11
  </p>
21
- {%- if render_url -%}</a>{%- endif -%}
12
+ {%- if author.url -%}</a>{%- endif -%}
22
13
  </div>
@@ -2,7 +2,7 @@
2
2
  {% if page.next.url %}
3
3
  <div id="previous-post">
4
4
  <a alt="{{ page.next.title }}" href="{{ page.next.url | relative_url }}">
5
- <p>{{ site.theme_settings.str_previous_post }}</p>
5
+ <p>{{ site.data.language.str_previous_post | default: "Previous post" }}</p>
6
6
  {{ page.next.title }}
7
7
  </a>
8
8
  </div>
@@ -11,7 +11,7 @@
11
11
  {% if page.previous.url %}
12
12
  <div id="next-post">
13
13
  <a alt="{{ page.previous.title }}" href="{{ page.previous.url | relative_url }}">
14
- <p>{{ site.theme_settings.str_next_post }}</p>
14
+ <p>{{ site.data.language.str_next_post | default: "Next post"}}</p>
15
15
  {{ page.previous.title }}
16
16
  </a>
17
17
  </div>
@@ -1,67 +1,67 @@
1
1
  <div class="share-buttons">
2
2
  <ul class="share-buttons">
3
3
  <div class="meta">Share</div>
4
- {% if site.theme_settings.share_buttons.facebook %}
4
+ {% if site.data.social.share.facebook or site.theme_settings.share_buttons.facebook %}
5
5
  <li>
6
- <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url }}" target="_blank" title="{{ site.theme_settings.str_share_on }} Facebook">
6
+ <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">
7
7
  <i class="fa fa-facebook-square fa-2x" aria-hidden="true"></i>
8
- <span class="sr-only">{{ site.theme_settings.str_share_on }} Facebook</span>
8
+ <span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} Facebook</span>
9
9
  </a>
10
10
  </li>
11
- {% endif %} {% if site.theme_settings.share_buttons.twitter %}
11
+ {% endif %} {% if site.data.social.share.twitter or site.theme_settings.twitter %}
12
12
  <li>
13
- <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 }}">
13
+ <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 }}">
14
14
  <i class="fa fa-twitter-square fa-2x" aria-hidden="true"></i>
15
- <span class="sr-only">{{ site.theme_settings.str_tweet }}</span>
15
+ <span class="sr-only">{{ site.data.social.language.str_tweet | default: "Tweet" }}</span>
16
16
  </a>
17
17
  </li>
18
- {% endif %} {% if site.theme_settings.share_buttons.tumblr %}
18
+ {% endif %} {% if site.data.social.share.tumblr or site.theme_settings.tumblr %}
19
19
  <li>
20
- <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">
20
+ <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">
21
21
  <i class="fa fa-tumblr-square fa-2x" aria-hidden="true"></i>
22
- <span class="sr-only">{{ site.theme_settings.str_share_on }} Tumblr</span>
22
+ <span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} Tumblr</span>
23
23
  </a>
24
24
  </li>
25
- {% endif %} {% if site.theme_settings.share_buttons.pinterest %}
25
+ {% endif %} {% if site.data.social.share.pinterest or site.theme_settings.pinterest %}
26
26
  <li>
27
- <a href="http://pinterest.com/pin/create/button/?url={{ page.url | absolute_url }}&description=" target="_blank" title="{{ site.theme_settings.str_pin_it }}">
27
+ <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 }}">
28
28
  <i class="fa fa-pinterest-square fa-2x" aria-hidden="true"></i>
29
- <span class="sr-only">{{ site.theme_settings.str_pin_it }}</span>
29
+ <span class="sr-only">{{ site.data.social.language.str_pin_it | default: "Pin it" }}</span>
30
30
  </a>
31
31
  </li>
32
- {% endif %} {% if site.theme_settings.share_buttons.pocket %}
32
+ {% endif %} {% if site.data.social.share.pocket or site.theme_settings.pocket %}
33
33
  <li>
34
- <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">
34
+ <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">
35
35
  <i class="fa fa fa-get-pocket fa-2x" aria-hidden="true"></i>
36
- <span class="sr-only">{{ site.theme_settings.str_add_to }} Pocket</span>
36
+ <span class="sr-only">{{ site.data.social.language.str_add_to | default: "Add to" }} Pocket</span>
37
37
  </a>
38
38
  </li>
39
- {% endif %} {% if site.theme_settings.share_buttons.reddit %}
39
+ {% endif %} {% if site.data.social.share.reddit or site.theme_settings.reddit %}
40
40
  <li>
41
- <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">
41
+ <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">
42
42
  <i class="fa fa-reddit-square fa-2x" aria-hidden="true"></i>
43
- <span class="sr-only">{{ site.theme_settings.str_share_on }} Reddit</span>
43
+ <span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} Reddit</span>
44
44
  </a>
45
45
  </li>
46
- {% endif %} {% if site.theme_settings.share_buttons.linkedin %}
46
+ {% endif %} {% if site.data.social.share.linkedin or site.theme_settings.linkedin %}
47
47
  <li>
48
- <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">
48
+ <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">
49
49
  <i class="fa fa-linkedin fa-2x" aria-hidden="true"></i>
50
- <span class="sr-only">{{ site.theme_settings.str_share_on }} LinkedIn</span>
50
+ <span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} LinkedIn</span>
51
51
  </a>
52
52
  </li>
53
- {% endif %} {% if site.theme_settings.share_buttons.wordpress %}
53
+ {% endif %} {% if site.data.social.share.wordpress or site.theme_settings.wordpress %}
54
54
  <li>
55
- <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">
55
+ <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">
56
56
  <i class="fa fa-wordpress fa-2x" aria-hidden="true"></i>
57
- <span class="sr-only">{{ site.theme_settings.str_share_on }} WordPress</span>
57
+ <span class="sr-only">{{ site.data.social.language.str_share_on | default: "Share on" }} WordPress</span>
58
58
  </a>
59
59
  </li>
60
- {% endif %} {% if site.theme_settings.share_buttons.email %}
60
+ {% endif %} {% if site.data.social.share.email or site.theme_settings.email %}
61
61
  <li>
62
- <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 }}">
62
+ <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 }}">
63
63
  <i class="fa fa-envelope-square fa-2x" aria-hidden="true"></i>
64
- <span class="sr-only">{{ site.theme_settings.str_email }}</span>
64
+ <span class="sr-only">{{ site.data.social.language.str_email | default: "Email" }}</span>
65
65
  </a>
66
66
  </li>
67
67
  {% endif %}
@@ -4,4 +4,4 @@
4
4
  <meta property="og:type" content="article" />
5
5
  <meta property="og:title" content="{{ page.title | strip_html | truncate: '250' | escape }}" />
6
6
  <meta property="og:description" content="{{ page.excerpt | strip_html | truncate: '250' | escape }}" />
7
- <meta property="og:image" content="{{ page.feature-img | default: site.theme_settings.header_feature_image }}" />
7
+ <meta property="og:image" content="{{ page.feature-img | default: site.header_feature_image }}" />
data/_layouts/custom.html CHANGED
@@ -23,13 +23,13 @@ layout: default
23
23
  </article>
24
24
 
25
25
  <!-- Disqus -->
26
- {% if site.theme_settings.disqus_shortname %}
26
+ {% if site.disqus_shortname %}
27
27
  <div class="comments">
28
28
  {% include disqus.html %}
29
29
  </div>
30
30
  {% endif %}
31
31
 
32
32
  <!-- Post navigation -->
33
- {% if site.theme_settings.post_navigation %}
33
+ {% if site.post_navigation %}
34
34
  {% include post_nav.html %}
35
- {% endif %}
35
+ {% endif %}
@@ -1,4 +1,10 @@
1
1
  <!DOCTYPE html>
2
+ <!--
3
+ Type on Strap jekyll theme v2.0.0
4
+ Copyright 2016-2019 Sylhare
5
+ Theme free for personal and commercial use under the MIT license
6
+ https://github.com/sylhare/Type-on-Strap/blob/master/LICENSE
7
+ -->
2
8
  <html lang="en">
3
9
  {% include head.html %}
4
10
  <body>
data/_layouts/home.html CHANGED
@@ -5,8 +5,8 @@ layout: default
5
5
  <div class="home">
6
6
 
7
7
  <div id="main" class="call-out"
8
- style="background-image: url('{{ site.theme_settings.header_feature_image | relative_url }}')">
9
- <h1> {{ site.theme_settings.header_text | default: "Change <code>header_text</code> in <code>_config.yml</code>"}} </h1>
8
+ style="background-image: url('{{ site.header_feature_image | relative_url }}')">
9
+ <h1> {{ site.header_text | default: "Change <code>header_text</code> in <code>_config.yml</code>"}} </h1>
10
10
  </div>
11
11
 
12
12
  {% include blog.html %}
data/_layouts/post.html CHANGED
@@ -7,7 +7,7 @@ layout: default
7
7
  <header id="main" style="">
8
8
  {% unless page.hide_title %}
9
9
  <h1 id="{{ page.title | cgi_escape }}" class="title">{{ page.title }}</h1>
10
- {% include post_info.html post=page %}
10
+ {% include post_info.html author=page.author date=page.date %}
11
11
  {% endunless %}
12
12
  </header>
13
13
  <section class="post-content">
@@ -30,14 +30,14 @@ layout: default
30
30
  </article>
31
31
 
32
32
  <!-- Disqus -->
33
- {% if site.theme_settings.disqus_shortname %}
33
+ {% if site.disqus_shortname or site.theme_settings.disqus_shortname %}
34
34
  <div class="comments">
35
35
  {% include disqus.html %}
36
36
  </div>
37
37
  {% endif %}
38
38
 
39
39
  <!-- Post navigation -->
40
- {% if site.theme_settings.post_navigation %}
40
+ {% if site.post_navigation or site.theme_settings.post_navigation %}
41
41
  {% include post_nav.html %}
42
42
  {% endif %}
43
43
 
@@ -54,6 +54,6 @@ layout: default
54
54
  header#main {
55
55
  background-repeat:no-repeat;
56
56
  {% if page.feature-img %} background-image: url('{{ page.feature-img | relative_url }}');
57
- {% elsif page.color %}background-image: url('{{ site.theme_settings.color_image | relative_url }}'); {% endif %}
57
+ {% elsif page.color %}background-image: url('{{ site.color_image | relative_url }}'); {% endif %}
58
58
  }
59
59
  </style>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: type-on-strap
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sylhare
@@ -9,28 +9,28 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-09-22 00:00:00.000000000 Z
12
+ date: 2019-10-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: jekyll
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - "~>"
19
- - !ruby/object:Gem::Version
20
- version: '3.8'
21
18
  - - ">="
22
19
  - !ruby/object:Gem::Version
23
- version: 3.8.5
20
+ version: '3.5'
21
+ - - "<"
22
+ - !ruby/object:Gem::Version
23
+ version: '5.0'
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
- - - "~>"
29
- - !ruby/object:Gem::Version
30
- version: '3.8'
31
28
  - - ">="
32
29
  - !ruby/object:Gem::Version
33
- version: 3.8.5
30
+ version: '3.5'
31
+ - - "<"
32
+ - !ruby/object:Gem::Version
33
+ version: '5.0'
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: jekyll-feed
36
36
  requirement: !ruby/object:Gem::Requirement
@@ -77,33 +77,36 @@ dependencies:
77
77
  name: bundler
78
78
  requirement: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '2.0'
83
- - - ">="
83
+ - - "<"
84
84
  - !ruby/object:Gem::Version
85
- version: 2.0.1
85
+ version: 2.1.0
86
86
  type: :development
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
89
89
  requirements:
90
- - - "~>"
90
+ - - ">="
91
91
  - !ruby/object:Gem::Version
92
92
  version: '2.0'
93
- - - ">="
93
+ - - "<"
94
94
  - !ruby/object:Gem::Version
95
- version: 2.0.1
96
- description: A custom Type Theme template (a free and open-source Jekyll theme). Great
95
+ version: 2.1.0
96
+ description: A simple and responsive jekyll theme template based on type-theme. Great
97
97
  for blogs, easy to customize and responsive.
98
98
  email:
99
99
  - sylhare@outlook.com
100
100
  - hellorohan@outlook.com
101
101
  executables: []
102
102
  extensions: []
103
- extra_rdoc_files: []
103
+ extra_rdoc_files:
104
+ - README.md
105
+ - LICENSE
104
106
  files:
105
107
  - LICENSE
106
108
  - README.md
109
+ - _data/language.yml
107
110
  - _includes/blog.html
108
111
  - _includes/blog_nav.html
109
112
  - _includes/disqus.html
@@ -125,11 +128,9 @@ files:
125
128
  - _layouts/post.html
126
129
  - _layouts/search.html
127
130
  - _layouts/tags.html
128
- - _sass/.DS_Store
129
131
  - _sass/base/_global.scss
130
132
  - _sass/base/_utility.scss
131
133
  - _sass/base/_variables.scss
132
- - _sass/external/.DS_Store
133
134
  - _sass/external/_font-awesome.scss
134
135
  - _sass/external/_katex.scss
135
136
  - _sass/external/_pacifico.scss
@@ -163,14 +164,11 @@ files:
163
164
  - _sass/layouts/_search.scss
164
165
  - _sass/layouts/_tags.scss
165
166
  - _sass/type-on-strap.scss
166
- - assets/css/.DS_Store
167
167
  - assets/css/bootstrap-iso.less
168
168
  - assets/css/main.scss
169
169
  - assets/css/vendor/bootstrap-iso.css
170
170
  - assets/css/vendor/bootstrap-iso.min.css
171
171
  - assets/css/vendor/bootstrap.css
172
- - assets/data/search.json
173
- - assets/fonts/.DS_Store
174
172
  - assets/fonts/Pacifico/Pacifico.eot
175
173
  - assets/fonts/Pacifico/Pacifico.svg
176
174
  - assets/fonts/Pacifico/Pacifico.ttf
@@ -278,23 +276,38 @@ files:
278
276
  homepage: https://github.com/sylhare/Type-on-Strap
279
277
  licenses:
280
278
  - MIT
281
- metadata: {}
282
- post_install_message:
283
- rdoc_options: []
279
+ metadata:
280
+ plugin_type: theme
281
+ post_install_message: |
282
+ ----------------------------------------------------------
283
+
284
+ Type on strap v2+ is using Jekyll 4.0:
285
+
286
+ * Please make sure you have updated your _config.yml.
287
+
288
+ * Use _data/ for social and language customization
289
+
290
+ * Vist https://github.com/sylhare/Type-on-Strap
291
+ for more info.
292
+
293
+ ----------------------------------------------------------
294
+ rdoc_options:
295
+ - "--charset=UTF-8"
284
296
  require_paths:
285
297
  - lib
286
298
  required_ruby_version: !ruby/object:Gem::Requirement
287
299
  requirements:
288
- - - "~>"
300
+ - - ">="
289
301
  - !ruby/object:Gem::Version
290
- version: '2.3'
302
+ version: 2.4.0
291
303
  required_rubygems_version: !ruby/object:Gem::Requirement
292
304
  requirements:
293
305
  - - ">="
294
306
  - !ruby/object:Gem::Version
295
307
  version: '0'
296
308
  requirements: []
297
- rubygems_version: 3.0.4
309
+ rubyforge_project:
310
+ rubygems_version: 2.7.7
298
311
  signing_key:
299
312
  specification_version: 4
300
313
  summary: A simple and responsive jekyll theme template
data/_sass/.DS_Store DELETED
Binary file
Binary file
data/assets/css/.DS_Store DELETED
Binary file
@@ -1,29 +0,0 @@
1
- ---
2
- ---
3
- [
4
- {% for post in site.posts %}
5
- {
6
- "title" : "{{ post.title | escape }}",
7
- "category" : "{{ post.category }}",
8
- "tags" : "{{ post.tags | join: ', ' | prepend: " " }}",
9
- "url" : "{{ post.url | relative_url }}",
10
- "date" : "{{ post.date | date: "%B %-d, %Y" }}",
11
- "excerpt" : {{ post.content | strip_html | truncate: '250' | escape | jsonify }},
12
- "content" : {{ post.content | strip_html | escape | jsonify }}
13
- } {% unless forloop.last %},{% endunless %}
14
- {% endfor %}
15
- {% if site.portfolio.size > 0 %},{% endif %}
16
- {% for page in site.portfolio %}
17
- {
18
- {% if page.title != nil %}
19
- "title" : "{{ page.title | escape }}",
20
- "category" : "{{ page.category }}",
21
- "tags" : "{{ page.tags | join: ', ' | prepend: " " }}",
22
- "url" : "{{ page.url | relative_url }}",
23
- "date" : "{{ page.date | date: "%B %-d, %Y" }}",
24
- "excerpt" : {{ page.content | strip_html | truncate: '250' | jsonify }},
25
- "content" : {{ page.content | strip_html | escape | jsonify }}
26
- {% endif %}
27
- } {% unless forloop.last %},{% endunless %}
28
- {% endfor %}
29
- ]
Binary file