jekyll-theme-merlot 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +3 -3
  3. data/_layouts/default.html +6 -8
  4. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bf399f9d07be0cd919a563af60e438410d4c2587
4
- data.tar.gz: cea41e5620d185147a0fee20eef38d34905c6558
3
+ metadata.gz: a3a41f409fa890fb8c4d7c2796cce88f2b3dbbb8
4
+ data.tar.gz: 6f1e87e1984e5db6f5c2a19624785a0d6e738c87
5
5
  SHA512:
6
- metadata.gz: 60e308e55e1031f5fd74190d65d70910d2437b015589410907eb74ce59d7b040af31671b23516f8e9de3752a584133e4c4c0faf91bf648d8da397bb91417bf3c
7
- data.tar.gz: c5e7421b8937ea1c5d5f44442796c9516d1c9ff2ecc56beb7a6028a80d4fff9181ff7a53a98386b8b360bd73510ec7234eb9e84b2693eff0f4c431276c669946
6
+ metadata.gz: de2ee28ae9e6435f733e2557024ce392892d98040d672e6a518cc62bb05cef9af564aabeb456310ef318087240a40614df0efc69402e073aca91d1d210f4ca34
7
+ data.tar.gz: 9c717dd2765c32b3771873ae41733f0dba6beacf333efd0ee8b94e3b94144e7394f6a63506e25e5f26494e4277e542d2b95d2ee87ce5aa4a07242151403e1866
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # The Merlot theme
2
2
 
3
- [![Build Status](https://travis-ci.org/pages-themes/jekyll-theme-merlot.svg?branch=master)](https://travis-ci.org/pages-themes/jekyll-theme-merlot) [![Gem Version](https://badge.fury.io/rb/jekyll-theme-merlot.svg)](https://badge.fury.io/rb/jekyll-theme-merlot)
3
+ [![Build Status](https://travis-ci.org/pages-themes/merlot.svg?branch=master)](https://travis-ci.org/pages-themes/merlot) [![Gem Version](https://badge.fury.io/rb/jekyll-theme-merlot.svg)](https://badge.fury.io/rb/jekyll-theme-merlot)
4
4
 
5
5
  *Merlot is a Jekyll theme for GitHub Pages. You can [preview the theme to see what it looks like](http://pages-themes.github.io/merlot), or even [use it today](#usage).*
6
6
 
@@ -46,7 +46,7 @@ google_analytics: [Your Google Analytics tracking ID]
46
46
 
47
47
  If you'd like to add your own custom styles:
48
48
 
49
- 1. Create a file called `/assets/css/style.css` in your site
49
+ 1. Create a file called `/assets/css/style.scss` in your site
50
50
  2. Add the following content to the top of the file, exactly as shown:
51
51
  ```scss
52
52
  ---
@@ -67,7 +67,7 @@ If you'd like to change the theme's HTML layout:
67
67
 
68
68
  ## Roadmap
69
69
 
70
- See the [open issues](https://github.com/pagse-themes/merlot/issues) for a list of proposed features (and known issues).
70
+ See the [open issues](https://github.com/pages-themes/merlot/issues) for a list of proposed features (and known issues).
71
71
 
72
72
  ## Project philosophy
73
73
 
@@ -77,14 +77,12 @@
77
77
 
78
78
  {% if site.google_analytics %}
79
79
  <script type="text/javascript">
80
- var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
81
- document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
82
- </script>
83
- <script type="text/javascript">
84
- try {
85
- var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
86
- pageTracker._trackPageview();
87
- } catch(err) {}
80
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
81
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
82
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
83
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
84
+ ga('create', '{{ site.google_analytics }}', 'auto');
85
+ ga('send', 'pageview');
88
86
  </script>
89
87
  {% endif %}
90
88
  </body>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-theme-merlot
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Cameron McEfee
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-12-14 00:00:00.000000000 Z
12
+ date: 2017-03-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: jekyll
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
103
103
  version: '0'
104
104
  requirements: []
105
105
  rubyforge_project:
106
- rubygems_version: 2.5.2
106
+ rubygems_version: 2.6.11
107
107
  signing_key:
108
108
  specification_version: 4
109
109
  summary: Merlot is a Jekyll theme for GitHub Pages