jekyll-theme-merlot 0.0.3 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/README.md +38 -14
- data/_includes/head-custom-google-analytics.html +10 -0
- data/_includes/head-custom.html +9 -0
- data/_layouts/default.html +10 -20
- data/_sass/merlot.scss +4 -0
- metadata +75 -11
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: 1a632a180f84962e0fa30f29273f23c7533af69b9043b0eec27b5001762b3791
|
|
4
|
+
data.tar.gz: 8b0995b89e82b4810461cc497c72e6f5335e51880a9aa06b7bbf43214e2c235e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a448b06860349c063ac476ce91ecbc91e9b563c376861a2bde4cb8214d9eb02ae16528bda736792b4191c2ec9fb2ae489f9cc4ae1f8fdf9d250916ca8de06d14
|
|
7
|
+
data.tar.gz: 6926810e32d92cfc515f2b4f9112e7943a864b209b7fc985bf530bd7be25eb4b440c11353933b115557a211e76bb08087998557a3a0a2e41c3db5013b236dd65
|
data/README.md
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# The Merlot theme
|
|
2
2
|
|
|
3
|
-
[](https://github.com/pages-themes/merlot/actions/workflows/ci.yaml) [](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
|
|
|
7
|
-
|
|
8
8
|
|
|
9
9
|
## Usage
|
|
10
10
|
|
|
@@ -13,7 +13,9 @@ To use the Merlot theme:
|
|
|
13
13
|
1. Add the following to your site's `_config.yml`:
|
|
14
14
|
|
|
15
15
|
```yml
|
|
16
|
-
|
|
16
|
+
remote_theme: pages-themes/merlot@v0.2.0
|
|
17
|
+
plugins:
|
|
18
|
+
- jekyll-remote-theme # add this line to the plugins list if you already have one
|
|
17
19
|
```
|
|
18
20
|
|
|
19
21
|
2. Optionally, if you'd like to preview your site on your computer, add the following to your site's `Gemfile`:
|
|
@@ -22,8 +24,6 @@ To use the Merlot theme:
|
|
|
22
24
|
gem "github-pages", group: :jekyll_plugins
|
|
23
25
|
```
|
|
24
26
|
|
|
25
|
-
|
|
26
|
-
|
|
27
27
|
## Customizing
|
|
28
28
|
|
|
29
29
|
### Configuration variables
|
|
@@ -38,7 +38,7 @@ description: [A short description of your site's purpose]
|
|
|
38
38
|
Additionally, you may choose to set the following optional variables:
|
|
39
39
|
|
|
40
40
|
```yml
|
|
41
|
-
show_downloads: ["true" or "false" to indicate whether to provide a download URL]
|
|
41
|
+
show_downloads: ["true" or "false" (unquoted) to indicate whether to provide a download URL]
|
|
42
42
|
google_analytics: [Your Google Analytics tracking ID]
|
|
43
43
|
```
|
|
44
44
|
|
|
@@ -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.
|
|
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
|
---
|
|
@@ -56,18 +56,42 @@ If you'd like to add your own custom styles:
|
|
|
56
56
|
```
|
|
57
57
|
3. Add any custom CSS (or Sass, including imports) you'd like immediately after the `@import` line
|
|
58
58
|
|
|
59
|
+
*Note: If you'd like to change the theme's Sass variables, you must set new values before the `@import` line in your stylesheet.*
|
|
60
|
+
|
|
59
61
|
### Layouts
|
|
60
62
|
|
|
61
63
|
If you'd like to change the theme's HTML layout:
|
|
62
64
|
|
|
63
|
-
1. [
|
|
64
|
-
2.
|
|
65
|
-
3.
|
|
66
|
-
4.
|
|
65
|
+
1. For some changes such as a custom `favicon`, you can add custom files in your local `_includes` folder. The files [provided with the theme](https://github.com/pages-themes/merlot/tree/master/_includes) provide a starting point and are included by the [original layout template](https://github.com/pages-themes/merlot/blob/master/_layouts/default.html).
|
|
66
|
+
2. For more extensive changes, [copy the original template](https://github.com/pages-themes/merlot/blob/master/_layouts/default.html) from the theme's repository<br />(*Pro-tip: click "raw" to make copying easier*)
|
|
67
|
+
3. Create a file called `/_layouts/default.html` in your site
|
|
68
|
+
4. Paste the default layout content copied in the first step
|
|
69
|
+
5. Customize the layout as you'd like
|
|
70
|
+
|
|
71
|
+
### Customizing Google Analytics code
|
|
72
|
+
|
|
73
|
+
Google has released several iterations to their Google Analytics code over the years since this theme was first created. If you would like to take advantage of the latest code, paste it into `_includes/head-custom-google-analytics.html` in your Jekyll site.
|
|
74
|
+
|
|
75
|
+
### Overriding GitHub-generated URLs
|
|
76
|
+
|
|
77
|
+
Templates often rely on URLs supplied by GitHub such as links to your repository or links to download your project. If you'd like to override one or more default URLs:
|
|
78
|
+
|
|
79
|
+
1. Look at [the template source](https://github.com/pages-themes/merlot/blob/master/_layouts/default.html) to determine the name of the variable. It will be in the form of `{{ site.github.zip_url }}`.
|
|
80
|
+
2. Specify the URL that you'd like the template to use in your site's `_config.yml`. For example, if the variable was `site.github.url`, you'd add the following:
|
|
81
|
+
```yml
|
|
82
|
+
github:
|
|
83
|
+
zip_url: http://example.com/download.zip
|
|
84
|
+
another_url: another value
|
|
85
|
+
```
|
|
86
|
+
3. When your site is built, Jekyll will use the URL you specified, rather than the default one provided by GitHub.
|
|
87
|
+
|
|
88
|
+
*Note: You must remove the `site.` prefix, and each variable name (after the `github.`) should be indent with two space below `github:`.*
|
|
89
|
+
|
|
90
|
+
For more information, see [the Jekyll variables documentation](https://jekyllrb.com/docs/variables/).
|
|
67
91
|
|
|
68
92
|
## Roadmap
|
|
69
93
|
|
|
70
|
-
See the [open issues](https://github.com/
|
|
94
|
+
See the [open issues](https://github.com/pages-themes/merlot/issues) for a list of proposed features (and known issues).
|
|
71
95
|
|
|
72
96
|
## Project philosophy
|
|
73
97
|
|
|
@@ -75,7 +99,7 @@ The Merlot theme is intended to make it quick and easy for GitHub Pages users to
|
|
|
75
99
|
|
|
76
100
|
## Contributing
|
|
77
101
|
|
|
78
|
-
Interested in contributing to Merlot? We'd love your help. Merlot is an open source project, built one contribution at a time by users like you. See [the CONTRIBUTING file](CONTRIBUTING.md) for instructions on how to contribute.
|
|
102
|
+
Interested in contributing to Merlot? We'd love your help. Merlot is an open source project, built one contribution at a time by users like you. See [the CONTRIBUTING file](docs/CONTRIBUTING.md) for instructions on how to contribute.
|
|
79
103
|
|
|
80
104
|
### Previewing the theme locally
|
|
81
105
|
|
|
@@ -89,4 +113,4 @@ If you'd like to preview the theme locally (for example, in the process of propo
|
|
|
89
113
|
|
|
90
114
|
### Running tests
|
|
91
115
|
|
|
92
|
-
The theme contains a minimal test suite, to ensure a site with the theme would build successfully. To run the tests, simply run `script/cibuild`. You'll need to run `script/bootstrap`
|
|
116
|
+
The theme contains a minimal test suite, to ensure a site with the theme would build successfully. To run the tests, simply run `script/cibuild`. You'll need to run `script/bootstrap` once before the test script will work.
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
{% if site.google_analytics %}
|
|
2
|
+
<script>
|
|
3
|
+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
|
4
|
+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
|
5
|
+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
|
6
|
+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
|
7
|
+
ga('create', '{{ site.google_analytics }}', 'auto');
|
|
8
|
+
ga('send', 'pageview');
|
|
9
|
+
</script>
|
|
10
|
+
{% endif %}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<!-- start custom head snippets, customize with your own _includes/head-custom.html file -->
|
|
2
|
+
|
|
3
|
+
<!-- Setup Google Analytics -->
|
|
4
|
+
{% include head-custom-google-analytics.html %}
|
|
5
|
+
|
|
6
|
+
<!-- You can set your favicon here -->
|
|
7
|
+
<!-- link rel="shortcut icon" type="image/x-icon" href="{{ '/favicon.ico' | relative_url }}" -->
|
|
8
|
+
|
|
9
|
+
<!-- end custom head snippets -->
|
data/_layouts/default.html
CHANGED
|
@@ -1,23 +1,26 @@
|
|
|
1
1
|
<!DOCTYPE html>
|
|
2
|
-
<html>
|
|
2
|
+
<html lang="{{ site.lang | default: "en-US" }}">
|
|
3
3
|
<head>
|
|
4
4
|
<meta charset='utf-8'>
|
|
5
|
-
<meta http-equiv="X-UA-Compatible" content="
|
|
5
|
+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
6
6
|
<meta name="viewport" content="width=640">
|
|
7
7
|
|
|
8
8
|
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}" media="screen">
|
|
9
9
|
<link rel="stylesheet" href="{{ '/assets/css/mobile.css' | relative_url }}" media="handheld, only screen and (max-device-width:640px)">
|
|
10
10
|
<link rel="stylesheet" href="{{ '/assets/css/non-screen.css' | relative_url }}" media="handheld, only screen and (max-device-width:640px)">
|
|
11
11
|
|
|
12
|
-
<script
|
|
13
|
-
<script
|
|
14
|
-
<script
|
|
15
|
-
<script
|
|
12
|
+
<script src="{{ '/assets/js/modernizr.js' | relative_url }}"></script>
|
|
13
|
+
<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
|
|
14
|
+
<script src="{{ '/assets/js/headsmart.min.js' | relative_url }}"></script>
|
|
15
|
+
<script>
|
|
16
16
|
$(document).ready(function () {
|
|
17
17
|
$('#main_content').headsmart()
|
|
18
18
|
})
|
|
19
19
|
</script>
|
|
20
|
-
|
|
20
|
+
|
|
21
|
+
{% seo %}
|
|
22
|
+
|
|
23
|
+
{% include head-custom.html %}
|
|
21
24
|
</head>
|
|
22
25
|
|
|
23
26
|
<body>
|
|
@@ -74,18 +77,5 @@
|
|
|
74
77
|
</footer>
|
|
75
78
|
|
|
76
79
|
</div>
|
|
77
|
-
|
|
78
|
-
{% if site.google_analytics %}
|
|
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) {}
|
|
88
|
-
</script>
|
|
89
|
-
{% endif %}
|
|
90
80
|
</body>
|
|
91
81
|
</html>
|
data/_sass/merlot.scss
ADDED
metadata
CHANGED
|
@@ -1,31 +1,93 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: jekyll-theme-merlot
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0
|
|
4
|
+
version: 0.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Cameron McEfee
|
|
8
8
|
- GitHub, Inc.
|
|
9
|
-
autorequire:
|
|
9
|
+
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date:
|
|
12
|
+
date: 2021-07-29 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: jekyll
|
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
|
17
|
+
requirements:
|
|
18
|
+
- - ">"
|
|
19
|
+
- !ruby/object:Gem::Version
|
|
20
|
+
version: '3.5'
|
|
21
|
+
- - "<"
|
|
22
|
+
- !ruby/object:Gem::Version
|
|
23
|
+
version: '5.0'
|
|
24
|
+
type: :runtime
|
|
25
|
+
prerelease: false
|
|
26
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
27
|
+
requirements:
|
|
28
|
+
- - ">"
|
|
29
|
+
- !ruby/object:Gem::Version
|
|
30
|
+
version: '3.5'
|
|
31
|
+
- - "<"
|
|
32
|
+
- !ruby/object:Gem::Version
|
|
33
|
+
version: '5.0'
|
|
34
|
+
- !ruby/object:Gem::Dependency
|
|
35
|
+
name: jekyll-seo-tag
|
|
16
36
|
requirement: !ruby/object:Gem::Requirement
|
|
17
37
|
requirements:
|
|
18
38
|
- - "~>"
|
|
19
39
|
- !ruby/object:Gem::Version
|
|
20
|
-
version: '
|
|
40
|
+
version: '2.0'
|
|
21
41
|
type: :runtime
|
|
22
42
|
prerelease: false
|
|
23
43
|
version_requirements: !ruby/object:Gem::Requirement
|
|
24
44
|
requirements:
|
|
25
45
|
- - "~>"
|
|
26
46
|
- !ruby/object:Gem::Version
|
|
27
|
-
version: '
|
|
28
|
-
|
|
47
|
+
version: '2.0'
|
|
48
|
+
- !ruby/object:Gem::Dependency
|
|
49
|
+
name: html-proofer
|
|
50
|
+
requirement: !ruby/object:Gem::Requirement
|
|
51
|
+
requirements:
|
|
52
|
+
- - "~>"
|
|
53
|
+
- !ruby/object:Gem::Version
|
|
54
|
+
version: '3.0'
|
|
55
|
+
type: :development
|
|
56
|
+
prerelease: false
|
|
57
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
58
|
+
requirements:
|
|
59
|
+
- - "~>"
|
|
60
|
+
- !ruby/object:Gem::Version
|
|
61
|
+
version: '3.0'
|
|
62
|
+
- !ruby/object:Gem::Dependency
|
|
63
|
+
name: rubocop-github
|
|
64
|
+
requirement: !ruby/object:Gem::Requirement
|
|
65
|
+
requirements:
|
|
66
|
+
- - "~>"
|
|
67
|
+
- !ruby/object:Gem::Version
|
|
68
|
+
version: '0.16'
|
|
69
|
+
type: :development
|
|
70
|
+
prerelease: false
|
|
71
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
72
|
+
requirements:
|
|
73
|
+
- - "~>"
|
|
74
|
+
- !ruby/object:Gem::Version
|
|
75
|
+
version: '0.16'
|
|
76
|
+
- !ruby/object:Gem::Dependency
|
|
77
|
+
name: w3c_validators
|
|
78
|
+
requirement: !ruby/object:Gem::Requirement
|
|
79
|
+
requirements:
|
|
80
|
+
- - "~>"
|
|
81
|
+
- !ruby/object:Gem::Version
|
|
82
|
+
version: '1.3'
|
|
83
|
+
type: :development
|
|
84
|
+
prerelease: false
|
|
85
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
86
|
+
requirements:
|
|
87
|
+
- - "~>"
|
|
88
|
+
- !ruby/object:Gem::Version
|
|
89
|
+
version: '1.3'
|
|
90
|
+
description:
|
|
29
91
|
email:
|
|
30
92
|
- opensource+jekyll-theme-merlot@github.com
|
|
31
93
|
executables: []
|
|
@@ -34,8 +96,11 @@ extra_rdoc_files: []
|
|
|
34
96
|
files:
|
|
35
97
|
- LICENSE
|
|
36
98
|
- README.md
|
|
99
|
+
- _includes/head-custom-google-analytics.html
|
|
100
|
+
- _includes/head-custom.html
|
|
37
101
|
- _layouts/default.html
|
|
38
102
|
- _sass/jekyll-theme-merlot.scss
|
|
103
|
+
- _sass/merlot.scss
|
|
39
104
|
- _sass/rouge-base16-solarized.scss
|
|
40
105
|
- _sass/screen.scss
|
|
41
106
|
- assets/css/mobile.css
|
|
@@ -87,7 +152,7 @@ homepage: https://github.com/pages-themes/merlot
|
|
|
87
152
|
licenses:
|
|
88
153
|
- CC0-1.0
|
|
89
154
|
metadata: {}
|
|
90
|
-
post_install_message:
|
|
155
|
+
post_install_message:
|
|
91
156
|
rdoc_options: []
|
|
92
157
|
require_paths:
|
|
93
158
|
- lib
|
|
@@ -95,16 +160,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
95
160
|
requirements:
|
|
96
161
|
- - ">="
|
|
97
162
|
- !ruby/object:Gem::Version
|
|
98
|
-
version:
|
|
163
|
+
version: 2.4.0
|
|
99
164
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
100
165
|
requirements:
|
|
101
166
|
- - ">="
|
|
102
167
|
- !ruby/object:Gem::Version
|
|
103
168
|
version: '0'
|
|
104
169
|
requirements: []
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
signing_key:
|
|
170
|
+
rubygems_version: 3.2.15
|
|
171
|
+
signing_key:
|
|
108
172
|
specification_version: 4
|
|
109
173
|
summary: Merlot is a Jekyll theme for GitHub Pages
|
|
110
174
|
test_files: []
|