jekyll-theme-merlot 0.1.0 → 0.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/README.md +21 -4
- data/_layouts/default.html +6 -6
- metadata +45 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: 9f8db2c4b20401a1ea204d193ba6bf9d23312ae1c6fc739d4369e55d5fc82b54
|
|
4
|
+
data.tar.gz: af28e359f170031c126fd09169f2c6526ed5679f83ddfa85a8c69cc6492e6f5b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 37d4fcc0c4596809ea40fdbe5a389bd2ecbeba2ee60e46cbef06007df3796adc01320e6ace3ddbf69a1a0b949ff7e059d1151c85ffb16ab5d4e04690a60bb27e
|
|
7
|
+
data.tar.gz: ad344d92c6e0386d12f32546027ac1c43b8bfcdceddd6b6c65a1fe16605cc165f83326c72acdf0a30c485414e467da2591a459d182ecbbf1e93f21e4abb6adac
|
data/README.md
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
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
|
|
|
@@ -22,8 +22,6 @@ To use the Merlot theme:
|
|
|
22
22
|
gem "github-pages", group: :jekyll_plugins
|
|
23
23
|
```
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
27
25
|
## Customizing
|
|
28
26
|
|
|
29
27
|
### Configuration variables
|
|
@@ -56,6 +54,8 @@ If you'd like to add your own custom styles:
|
|
|
56
54
|
```
|
|
57
55
|
3. Add any custom CSS (or Sass, including imports) you'd like immediately after the `@import` line
|
|
58
56
|
|
|
57
|
+
*Note: If you'd like to change the theme's Sass variables, you must set new values before the `@import` line in your stylesheet.*
|
|
58
|
+
|
|
59
59
|
### Layouts
|
|
60
60
|
|
|
61
61
|
If you'd like to change the theme's HTML layout:
|
|
@@ -65,6 +65,23 @@ If you'd like to change the theme's HTML layout:
|
|
|
65
65
|
3. Paste the default layout content copied in the first step
|
|
66
66
|
4. Customize the layout as you'd like
|
|
67
67
|
|
|
68
|
+
### Overriding GitHub-generated URLs
|
|
69
|
+
|
|
70
|
+
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:
|
|
71
|
+
|
|
72
|
+
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 }}`.
|
|
73
|
+
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:
|
|
74
|
+
```yml
|
|
75
|
+
github:
|
|
76
|
+
zip_url: http://example.com/download.zip
|
|
77
|
+
another_url: another value
|
|
78
|
+
```
|
|
79
|
+
3. When your site is built, Jekyll will use the URL you specified, rather than the default one provided by GitHub.
|
|
80
|
+
|
|
81
|
+
*Note: You must remove the `site.` prefix, and each variable name (after the `github.`) should be indent with two space below `github:`.*
|
|
82
|
+
|
|
83
|
+
For more information, see [the Jekyll variables documentation](https://jekyllrb.com/docs/variables/).
|
|
84
|
+
|
|
68
85
|
## Roadmap
|
|
69
86
|
|
|
70
87
|
See the [open issues](https://github.com/pages-themes/merlot/issues) for a list of proposed features (and known issues).
|
|
@@ -75,7 +92,7 @@ The Merlot theme is intended to make it quick and easy for GitHub Pages users to
|
|
|
75
92
|
|
|
76
93
|
## Contributing
|
|
77
94
|
|
|
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.
|
|
95
|
+
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
96
|
|
|
80
97
|
### Previewing the theme locally
|
|
81
98
|
|
data/_layouts/default.html
CHANGED
|
@@ -2,17 +2,17 @@
|
|
|
2
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
|
})
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
</div>
|
|
78
78
|
|
|
79
79
|
{% if site.google_analytics %}
|
|
80
|
-
<script
|
|
80
|
+
<script>
|
|
81
81
|
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
|
82
82
|
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
|
83
83
|
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
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.1.
|
|
4
|
+
version: 0.1.1
|
|
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:
|
|
12
|
+
date: 2018-04-11 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: jekyll
|
|
@@ -39,6 +39,48 @@ dependencies:
|
|
|
39
39
|
- - "~>"
|
|
40
40
|
- !ruby/object:Gem::Version
|
|
41
41
|
version: '2.0'
|
|
42
|
+
- !ruby/object:Gem::Dependency
|
|
43
|
+
name: html-proofer
|
|
44
|
+
requirement: !ruby/object:Gem::Requirement
|
|
45
|
+
requirements:
|
|
46
|
+
- - "~>"
|
|
47
|
+
- !ruby/object:Gem::Version
|
|
48
|
+
version: '3.0'
|
|
49
|
+
type: :development
|
|
50
|
+
prerelease: false
|
|
51
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
52
|
+
requirements:
|
|
53
|
+
- - "~>"
|
|
54
|
+
- !ruby/object:Gem::Version
|
|
55
|
+
version: '3.0'
|
|
56
|
+
- !ruby/object:Gem::Dependency
|
|
57
|
+
name: rubocop
|
|
58
|
+
requirement: !ruby/object:Gem::Requirement
|
|
59
|
+
requirements:
|
|
60
|
+
- - "~>"
|
|
61
|
+
- !ruby/object:Gem::Version
|
|
62
|
+
version: '0.50'
|
|
63
|
+
type: :development
|
|
64
|
+
prerelease: false
|
|
65
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
66
|
+
requirements:
|
|
67
|
+
- - "~>"
|
|
68
|
+
- !ruby/object:Gem::Version
|
|
69
|
+
version: '0.50'
|
|
70
|
+
- !ruby/object:Gem::Dependency
|
|
71
|
+
name: w3c_validators
|
|
72
|
+
requirement: !ruby/object:Gem::Requirement
|
|
73
|
+
requirements:
|
|
74
|
+
- - "~>"
|
|
75
|
+
- !ruby/object:Gem::Version
|
|
76
|
+
version: '1.3'
|
|
77
|
+
type: :development
|
|
78
|
+
prerelease: false
|
|
79
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
80
|
+
requirements:
|
|
81
|
+
- - "~>"
|
|
82
|
+
- !ruby/object:Gem::Version
|
|
83
|
+
version: '1.3'
|
|
42
84
|
description:
|
|
43
85
|
email:
|
|
44
86
|
- opensource+jekyll-theme-merlot@github.com
|
|
@@ -117,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
117
159
|
version: '0'
|
|
118
160
|
requirements: []
|
|
119
161
|
rubyforge_project:
|
|
120
|
-
rubygems_version: 2.6
|
|
162
|
+
rubygems_version: 2.7.6
|
|
121
163
|
signing_key:
|
|
122
164
|
specification_version: 4
|
|
123
165
|
summary: Merlot is a Jekyll theme for GitHub Pages
|