jekyll-theme-type-on-strap 6.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de10cd4d61cfd78ef7998be4a23bb2cd4eb739b
-  data.tar.gz: ab68162f3127033544fd6e5b97a78c6d5d2ad652
+  metadata.gz: 6d906fefe33357f8c7e752c62165a3ac3f67b912
+  data.tar.gz: c1ca6553498f10dd4c4b7b9d1bab334a1b7b98fe
 SHA512:
-  metadata.gz: ca169cbc57e48bb005c38c34c7667cb1ae7fff052a0ed36dc4cd0e6856276136e064b52b190efba77f84b113c79f9d7ce035726a841a841a4ffbbc57e3526f5c
-  data.tar.gz: eec817319419ec745c273e2851d08bdacfd8f0d9cf231ded1eabfffd0cb70c5ee75722310cc1e5e667e6c5d54e9c039001e62d32c9a41b47da743330bcdf9255
+  metadata.gz: 14c5c23879413584194c4d6e883f625dc1162efcbb538a6b64a0bc9befae234a23d4b7538e784ac0ad817dbb881f963e7b66d33bdf5de52015032aef51983627
+  data.tar.gz: c8b791fbccdf4d2b5c493b26cb02d6db604c7bcb08b7e496c6d6021f827405556b4fb2f9e527339fc21e6f72556df2dd67c3f09e2ab5e2e9aa2695ec76813dc7

data/README.md

@@ -11,6 +11,7 @@ A free and open-source [Jekyll](https://jekyllrb.com) theme. Based on Rohan Chan
 * Bootstrap : [Get Bootstrap](http://getbootstrap.com/)
 * Search feature : [Simple-Jekyll-Search](https://github.com/christian-fei/Simple-Jekyll-Search)
 * Math Rendering : [KateX](https://github.com/Khan/KaTeX)
+* Nice fonts : [Font Awesome](https://fontawesome.com/), [Source Sans Pro](https://fonts.google.com/specimen/Source+Sans+Pro), [Pacifico](https://fonts.google.com/specimen/Pacifico?selection.family=Pacifico) 
 * Seo Tags : [Jekyll-seo-tag](https://help.github.com/articles/search-engine-optimization-for-github-pages/)
 * Syntax Highlighting: Easily customisable [Base16](https://github.com/chriskempson/base16)
 * Free of rights images from [pexels](https://www.pexels.com/)
@@ -27,7 +28,8 @@ A free and open-source [Jekyll](https://jekyllrb.com) theme. Based on Rohan Chan
 4. [Layout](https://github.com/Sylhare/Type-on-Strap#layout)
 5. [Feature pages](https://github.com/Sylhare/Type-on-Strap#feature-pages)
 6. [Template as a Gem](https://github.com/Sylhare/Type-on-Strap#Template-as-a-Gem)
-7. [License](https://github.com/Sylhare/Type-on-Strap#license)
+7. [Advanced](https://github.com/Sylhare/Type-on-Strap#advanced)
+8. [License](https://github.com/Sylhare/Type-on-Strap#license)
 
 ## Usage
 
@@ -53,7 +55,7 @@ jekyll-theme-basically-basic
 ├── assets
 |  ├── js	               # theme javascript, Katex, jquery, bootstrap, jekyll search, 
 |  ├── css                     # isolated Bootstrap, font-awesome, katex and main css
-|  ├── fonts		       # Font-Awesome, Glyphicon, and other fonts
+|  ├── fonts		       # Font-Awesome, and other fonts
 |  └── img		       # Images used for the template
 ├── pages
 |   ├── 404.md		       # To be displayed when url is wrong
@@ -61,7 +63,7 @@ jekyll-theme-basically-basic
 |   ├── 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)
+|   └── tags.md         # The tag page
 ├── _config.yml                # sample configuration
 └── index.html                 # sample home page (blog page paginated)
 ```
@@ -94,15 +96,15 @@ Please configure this  before using the theme.
 
 ### Meta and Branding
 
-Meta variables hold basic information about your Jekyll site which will be used throughout the site and as meta properties for search engines, browsers, and the site's RSS feed.
+Meta variables hold basic information about your Jekyll site which will be used throughout the site 
+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/triangular.svg     # Path of avatar image, to be displayed in the theme's header
-    gravatar: f98....6bfc                 # MD5 hash of your email address
+    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
 ```
 
@@ -115,7 +117,7 @@ Customize your site header/footer with these variables in `_config.yml`:
 ```yml
   theme_settings:
     header_text: Welcome to my Jekyll blog
-    header_text_feature_image: assets/img/sample3.png
+    header_feature_image: assets/img/sample3.png
     footer_text: Copyright 2017
 ```
 
@@ -147,11 +149,14 @@ Jekyll works with [liquid](https://shopify.github.io/liquid/) tags usually repre
 {{ liquid.tag | filter }}
 ```
 
-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)
+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
 
-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:
+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:
 
 ```yml
   theme_settings:
@@ -166,7 +171,8 @@ Display the site's icon from [Font Awesome](https://fortawesome.github.io/Font-A
 Optionally, if you have a [Disqus](https://disqus.com/) account, you can show a 
 comments section below each post.
 
-To enable Disqus comments, add your [Disqus shortname](https://help.disqus.com/customer/portal/articles/466208) to your project's `_config.yml` file:
+To enable Disqus comments, add your [Disqus shortname](https://help.disqus.com/customer/portal/articles/466208) 
+to your project's `_config.yml` file:
 
 ```yml
   theme_settings:
@@ -192,7 +198,8 @@ When KateX is set in `_config.yml`:
      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 in `_config.yml` to `true` for math typesetting.
+You can then wrap math expressions with `$$` signs in your posts and make sure you have set the `katex` variable 
+in `_config.yml` to `true` for math typesetting.
 
 For inline math typesetting, type your math expression on the *same line* as your content. For example:
 
@@ -210,7 +217,9 @@ $$
 
 ### 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:
+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
@@ -226,7 +235,8 @@ some text in the excerpt
 The html is stripped out of the excerpt so it only display text.
 
 ## Layout
-Please refer to the [Jekyll docs for writing posts](https://jekyllrb.com/docs/posts/). Non-standard features are documented below.
+Please refer to the [Jekyll docs for writing posts](https://jekyllrb.com/docs/posts/). 
+Non-standard features are documented below.
 
 ### Layout: Post
 
@@ -239,14 +249,20 @@ title: Hello World                                # Title of the page
 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
+color: rgb(80,140,22)                             # Add the specified color as feature image, and change link colors in post
 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.
+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.
+
+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. 
 
-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.
+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.
 
 ### Layout: Page
 
@@ -260,11 +276,13 @@ subtitle: "This is a subtitle"
 feature-img: "assets/img/sample.png" 
 permalink: /about.html               # Set a permalink your your page
 hide: true                           # Prevent the page title to appear in the navbar
+icon: "fa-search"                    # Will Display only the fontawesome icon (here: fa-search) and not the title
 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.
+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: Default
 
@@ -272,7 +290,8 @@ This layout includes the head, navigation bar and footer around your content.
 
 ## Feature pages
 
-All feature pages besides the "home" one are stored in the `page` folder, they will appear in the navigation bar unless you set `Hide: true` in the front matter. 
+All feature pages besides the "home" one are stored in the `page` folder, 
+they will appear in the navigation bar unless you set `Hide: true` in the front matter. 
 
 Here are the documentation for the other feature pages that can be added through `_config.yml`.
 
@@ -281,7 +300,8 @@ 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. 
+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
 
@@ -297,11 +317,30 @@ title : Portfolio
 {% include portfolio.html %}
 ```
 
-### Gallery
+#### Portofolio posts
+
+You can format the portfolio posts in the `_portfolio` folder using the `post layout`. Here are little explaination on some of the possible feature you can use and what they will do.
 
-You can create a gallery using [Masonry JS](https://masonry.desandro.com/) which will placing the pictures in optimal position based on available vertical space. You need to specify the `gallery_path` which will be used to find the pictures to render. It will take all of the picture under that directory. Then use the `include` to add it in your page. 
+If you decide to use a date, please be sure to use one that can be parsed such as `yyyy-mm-dd`. You can see more format example on the demo posts that are available for the theme:
 
+```yml
+---
+layout: post
+title: Circus				       # Title of the portfolio post
+feature-img: "assets/img/portfolio/cake.png"   # Will display the image in the post
+img: "assets/img/portfolio/cake.png"           # Will display the image in the portfolio page
+date: 2019-07-25		 	       # Not mandatory, however needs to be in date format to display the date
+---
 ```
+
+### Gallery
+
+You can create a gallery using [Masonry JS](https://masonry.desandro.com/) which will placing the pictures in optimal position 
+based on available vertical space. 
+You need to specify the `gallery_path` which will be used to find the pictures to render. 
+It will take all of the picture under that directory. Then use the `include` to add it in your page. 
+
+```yml
 ---
 layout: page
 title: Gallery
@@ -314,22 +353,25 @@ gallery: "assets/img/pexels"
 
 ### Search
 
-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. 
+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 formatted results entered in the `search.html` page.
 
+The search page can be hidden with the `hide` option. You can remove the icon by removing `icon`:
 
-The search page can be enable/disable in the navigation bar through the `_config.yml` via:
 ```yml
-special_page:
-    search: 
-      icon: "search"
-      enabled: true
+---
+layout: search
+title: Search
+icon: "search"
+---
 ```
 
 ### Tags
 
-Tags should be placed between `[]` in your post metadata. Separate 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:
 
@@ -344,18 +386,12 @@ tags: [sample, markdown, html]
 > Tags are case sensitive `Tag_nAme` ≠ `tag_name`
 
 All the tags will be listed in `tags.html` with a link toward the pages or posts.
-The tags page can be enable/disable in the navigation bar through the `_config.yml` via:
-
-```yml
-special_page:
-    tags: 
-      icon: "tags"
-      enabled: true
-```
+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
 
-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).
+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.
 
 So if you're using the template as a theme, Make sure you have:
@@ -366,6 +402,31 @@ So if you're using the template as a theme, Make sure you have:
 
 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)
 
+## Advanced
+
+### Minimizing and optimizing: css, js and images
+
+Before you need to have `node` and `npm` installed:
+- Windows: https://nodejs.org/
+- Ubuntu/Debian: `apt-get install nodejs npm libgl1 libxi6`
+- Fedora (dnf) / RHEL/CentOS (yum): `dnf install node npm libglvnd-glx libXi`
+
+Then you need to install [`gulp-cli`](https://gulpjs.com/) and its dependencies:
+```shell
+cd assets/
+sudo npm install gulp-cli -g
+npm install
+```
+
+**Now, whenever you want to minify and optimize, run:**
+```shell
+cd assets/
+gulp default
+# tip: run a git status to see the changes
+git status
+```
+
 ## License
 
+There are some fonts and component on this theme going under the MIT licence as well in this theme.
 [The MIT License (MIT)](https://raw.githubusercontent.com/Sylhare/Type-on-Strap/master/LICENSE)

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

@@ -3,23 +3,29 @@
     <div class="post-teaser">
         {% if post.thumbnail %}
         <div class="post-img">
-            <img alt="{{ post.title }}" src="{{ post.thumbnail | relative_url }}">
+            <a aria-label="{{ post.title }}" href="{{ post.url | relative_url }}">
+                <img alt="{{ post.title }}" src="{{ post.thumbnail | relative_url }}">
+            </a>
         </div>
         {% endif %}
         <span>
           <header>
             <h1>
-              <a alt="{{ post.title }}" class="post-link" href="{{ post.url | relative_url }}">
+              <a aria-label="{{ post.title }}" class="post-link" href="{{ post.url | relative_url }}">
                 {{ post.title }}
               </a>
             </h1>
-            <p class="meta">
-              {{ post.date | date: "%B %-d, %Y" }}
-            </p>
+            {% include post_info.html author=post.author date=post.date %}
           </header>
-          <div class="excerpt">
-              {{ post.excerpt | strip_html | escape }}
-          </div>
+          {% if site.theme_settings.excerpt %}
+              <div class="excerpt">
+                  {% if site.theme_settings.excerpt == "truncate" %}
+                     {{ post.content | strip_html | truncate: '250' | escape }}
+                  {% else %}
+                     {{ post.excerpt | strip_html | escape }}
+                  {% endif %}
+              </div>
+          {% endif %}
       </span>
     </div>
     {% endfor %}

data/_includes/blog_nav.html

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

@@ -7,4 +7,4 @@
 		(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 }}</noscript>

data/_includes/head.html

@@ -1,7 +1,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    
+
     <!-- Main JS (navbar.js, katex_init.js and masonry_init.js)-->
     <script defer=true src="{{ '/assets/js/main.min.js' | relative_url }}"></script>
     
@@ -15,11 +15,7 @@
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
 
     <!-- RSS -->
-    <link rel="alternate" type="application/atom+xml" title="{{ site.theme_settings.title }}" href="{{ 'feed.xml' | absolute_url }}"/>
-
-    <!-- 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="{{ '/assets/css/vendor/font-awesome.min.css' | relative_url }}">
+    <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ 'feed.xml' | absolute_url }}"/>
     
     {% if page.bootstrap %}
     <!-- Bootstrap-4.1.3 isolation CSS -->
@@ -33,47 +29,37 @@
     <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>
     {% endif %}
 
-    <!-- Google Fonts -->
-    {% if site.theme_settings.google_fonts %}
-    <link href="//fonts.googleapis.com/css?family={{ site.theme_settings.google_fonts }}" rel="stylesheet" type="text/css">
-    {% else %}
-    <link rel="stylesheet" href="{{ '/assets/css/vendor/google_fonts.min.css' | relative_url }}">
-    {% endif %}
-
     <!-- KaTeX 0.8.3 -->
     <!-- if you have any issue check https://github.com/KaTeX/KaTeX -->
     {% if site.theme_settings.katex %}
-    <link rel="stylesheet" type="text/css" href="{{ '/assets/css/vendor/katex.min.css' | relative_url }}">
-    <script src="{{ '/assets/js/vendor/katex.min.js' | relative_url }}">
-    </script>
+    <script src="{{ '/assets/js/vendor/katex.min.js' | relative_url }}"></script>
     {% endif %}
 
     <!-- Google Analytics -->
     {% if site.theme_settings.google_analytics %}
+    <!-- Global site tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.theme_settings.google_analytics }}"></script>
     <script>
-        (function(i, s, o, g, r, a, m) {
-            i['GoogleAnalyticsObject'] = r;
-            i[r] = i[r] || function() {
-                (i[r].q = i[r].q || []).push(arguments)
-            }, i[r].l = 1 * new Date();
-            a = s.createElement(o),
-                m = s.getElementsByTagName(o)[0];
-            a.async = 1;
-            a.src = g;
-            m.parentNode.insertBefore(a, m)
-        })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-
-        ga('create', '{{ site.theme_settings.google_analytics }}', 'auto');
-        ga('send', 'pageview');
-
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', '{{ site.theme_settings.google_analytics }}');
     </script>
-    {% endif %}
     
+    <!-- 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('send', 'pageview');
+    </script>
+    {% endif %} <!-- End Google Analytics -->
+
     <!-- seo tags -->
     {% seo %}
     <!-- Manual seo tags -->
     <!--
-    <title>{% if page.title %}{{ page.title }} |{% endif %} {{ site.theme_settings.title }}</title>
+    <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 %}">
     -->
 </head>