Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc9db74d

Browse files
committed
Support Jekyll 3.0
- Update to Jekyll v3.0- Switch from Pygments.rb to Rouge for syntax highlighting- Include jekyll-gist gem- Update theme documentation-Closemmistakes#123
1 parent8abca8e commitc9db74d

File tree

10 files changed

+44
-110
lines changed

10 files changed

+44
-110
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ _site
55
codekit-config.json
66
node_modules
77
Gemfile.lock
8-
.sass-cache
8+
.sass-cache
9+
.jekyll-metadata

‎Gemfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
source"https://rubygems.org"
22

3-
gem'jekyll','2.5.3'
4-
gem'jekyll-sitemap'
5-
gem'octopress','~> 3.0'
3+
gem"jekyll","~> 3.0"
4+
gem"jekyll-sitemap"
5+
gem"octopress"
6+
gem"jekyll-paginate"
7+
gem"jekyll-gist"

‎Gemfile.lock‎

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,29 @@ GEM
22
remote:https://rubygems.org/
33
specs:
44
addressable (2.3.8)
5-
blankslate (2.1.2.4)
6-
classifier-reborn (2.0.4)
7-
fast-stemmer (~>1.0)
8-
coffee-script (2.4.1)
9-
coffee-script-source
10-
execjs
11-
coffee-script-source (1.10.0)
125
colorator (0.1)
13-
execjs (2.6.0)
146
faraday (0.9.2)
157
multipart-post (>=1.2,<3)
16-
fast-stemmer (1.0.2)
178
ffi (1.9.10)
18-
ffi (1.9.10-x64-mingw32)
19-
ffi (1.9.10-x86-mingw32)
20-
jekyll (2.5.3)
21-
classifier-reborn (~>2.0)
9+
jekyll (3.1.1)
2210
colorator (~>0.1)
23-
jekyll-coffeescript (~>1.0)
24-
jekyll-gist (~>1.0)
25-
jekyll-paginate (~>1.0)
2611
jekyll-sass-converter (~>1.0)
2712
jekyll-watch (~>1.1)
2813
kramdown (~>1.3)
29-
liquid (~>2.6.1)
14+
liquid (~>3.0)
3015
mercenary (~>0.3.3)
31-
pygments.rb (~>0.6.0)
32-
redcarpet (~>3.1)
16+
rouge (~>1.7)
3317
safe_yaml (~>1.0)
34-
toml (~>0.1.0)
35-
jekyll-coffeescript (1.0.1)
36-
coffee-script (~>2.2)
3718
jekyll-gist (1.4.0)
3819
octokit (~>4.2)
3920
jekyll-paginate (1.1.0)
4021
jekyll-sass-converter (1.4.0)
4122
sass (~>3.4)
42-
jekyll-sitemap (0.9.0)
23+
jekyll-sitemap (0.10.0)
4324
jekyll-watch (1.3.1)
4425
listen (~>3.0)
4526
kramdown (1.9.0)
46-
liquid (2.6.3)
27+
liquid (3.0.6)
4728
listen (3.0.5)
4829
rb-fsevent (>=0.9.3)
4930
rb-inotify (>=0.9)
@@ -61,39 +42,31 @@ GEM
6142
titlecase
6243
octopress-deploy (1.3.0)
6344
colorator
64-
octopress-escape-code (2.0.6)
65-
octopress-hooks (~>2.0)
45+
octopress-escape-code (2.1.1)
46+
jekyll (~>3.0)
6647
octopress-hooks (2.6.1)
6748
jekyll (>=2.0)
68-
parslet (1.5.0)
69-
blankslate (~>2.0)
70-
posix-spawn (0.3.11)
71-
pygments.rb (0.6.3)
72-
posix-spawn (~>0.3.6)
73-
yajl-ruby (~>1.2.0)
7449
rb-fsevent (0.9.7)
7550
rb-inotify (0.9.5)
7651
ffi (>=0.5.0)
7752
redcarpet (3.3.4)
53+
rouge (1.10.1)
7854
safe_yaml (1.0.4)
7955
sass (3.4.21)
8056
sawyer (0.6.0)
8157
addressable (~>2.3.5)
8258
faraday (~>0.8,<0.10)
8359
titlecase (0.1.1)
84-
toml (0.1.2)
85-
parslet (~>1.5.0)
86-
yajl-ruby (1.2.1)
8760

8861
PLATFORMS
8962
ruby
90-
x64-mingw32
91-
x86-mingw32
9263

9364
DEPENDENCIES
94-
jekyll (=2.5.3)
65+
jekyll (~>3.0)
66+
jekyll-gist
67+
jekyll-paginate
9568
jekyll-sitemap
96-
octopress (~>3.0)
69+
octopress
9770

9871
BUNDLED WITH
9972
1.11.2

‎Gruntfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module.exports = function(grunt) {
88
},
99
all:[
1010
'Gruntfile.js',
11-
'assets/js/*.js',
12-
'assets/js/plugins/*.js',
11+
'!assets/js/*.js',
12+
'!assets/js/plugins/*.js',
1313
'!assets/js/scripts.min.js'
1414
]
1515
},

‎_config.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ bing_verify:
3535
# http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
3636
timezone:America/New_York
3737
future:true
38-
highlighter:pygments
38+
highlighter:rouge
3939
markdown:kramdown
4040
gems:
4141
-jekyll-sitemap
42+
-jekyll-paginate
43+
-jekyll-gist
4244
sass:
4345
sass_dir:_sass
4446
style:compressed
@@ -54,7 +56,7 @@ kramdown:
5456
footnote_nr:1
5557
entity_output:as_char
5658
toc_levels:1..6
57-
use_coderay:true
59+
enable_coderay:false
5860

5961
coderay:
6062
coderay_line_numbers:nil

‎_posts/2013-08-16-code-highlighting-post.md‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout:post
33
title:Syntax Highlighting Post
44
description:"Demo post displaying the various ways of highlighting code in Markdown."
5-
modified:2014-12-23
5+
modified:2016-02-01
66
tags:[sample post, code, highlighting]
77
image:
88
feature:abstract-10.jpg
@@ -14,9 +14,9 @@ Syntax highlighting is a feature that displays source code, in different colors
1414

1515
[^1]:<http://en.wikipedia.org/wiki/Syntax_highlighting>
1616

17-
###Pygments Code Blocks
17+
###Highlighted Code Blocks
1818

19-
To modify styling and highlight colors edit`/_sass/_pygments.scss`.
19+
To modify styling and highlight colors edit`/_sass/_syntax.scss`.
2020

2121
{% highlight css %}
2222
#container {
@@ -115,10 +115,4 @@ module Jekyll
115115
end
116116
end
117117
end
118-
~~~
119-
120-
###GitHub Gist Embed
121-
122-
An example of a Gist embed below.
123-
124-
{% gist mmistakes/6589546 %}
118+
~~~

‎_sass/_pygments.scss‎renamed to ‎_sass/_syntax.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
pre.highlight {
2+
padding:1em;
3+
}
4+
15
.highlight {
26
margin-bottom:1.5em;
37
@includefont(12);

‎about/index.md‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,26 @@ image:
66
credit:dargadgetz
77
creditlink:http://www.dargadgetz.com/ios-7-abstract-wallpaper-pack-for-iphone-5-and-ipod-touch-retina/
88
comments:false
9-
modified:2014-12-24
9+
modified:2016-02-01
1010
---
1111

1212
They say three times the charm, so here is another free responsive Jekyll blog theme for you. I've learned a ton since open sourcing my first two themes[on Github](http://github.com/mmistakes), and wanted to try a few new things this time around.
1313

1414
If you've used any of[my other themes](http://mademistakes.com/work/jekyll-themes/) most of this should be familiar territory...
1515

16-
##WhatHPSTRbrings to the table:
16+
##HPSTRFeatures:
1717

18+
* Compatible with Jekyll 3 and GitHub Pages.
1819
* Responsive templates for post, page, and post index`_layouts`. Looks great on mobile, tablet, and desktop devices.
19-
* Gracefully degrads in older browsers. Compatible with Internet Explorer 8+ and all modern browsers.
20-
* Modern and minimal design.
20+
* Gracefully degrades in older browsers. Compatible with Internet Explorer 8+ and all modern browsers.
2121
* Sweet animated menu.
2222
* Background image support.
23-
* Readable typography to make your words shine.
2423
* Support for large images to call out your favorite posts.
25-
* Built-in support for Sass courtesy of Jekyll 2.x.
2624
* Optional[Disqus](http://disqus.com) comments.
2725
* Simple and clear permalink structure[^1].
2826
*[Open Graph](https://developers.facebook.com/docs/opengraph/) and[Twitter Cards](https://dev.twitter.com/docs/cards) support for a better social sharing experience.
29-
*Simple[custom 404 page]({{ site.url }}/404.html) to get you started.
30-
*Stylesheets for Pygments and Coderay[syntax highlighting]({{ site.url }}/code-highlighting-post/) to make your code examples look snazzy.
27+
*[Custom 404 page]({{ site.url }}/404.html) to get you started.
28+
*[Syntax highlighting]({{ site.url }}/code-highlighting-post/) stylesheets to make your code examples look snazzy.
3129

3230
<divmarkdown="0"><ahref="{{ site.url }}/theme-setup/"class="btn btn-info">Theme Setup</a> <ahref="https://github.com/mmistakes/hpstr-jekyll-theme"class="btn btn-success">Download HPSTR</a></div>
3331

‎assets/css/main.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sitemap: false
1919
@import"vendor/magnific-popup/magnific-popup";
2020
@import"site";
2121
@import"typography";
22-
@import"pygments";
22+
@import"syntax";
2323
@import"coderay";
2424
@import"gist";
2525
@import"grid";

‎theme-setup/index.md‎

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ share: true
1111

1212
General notes and suggestions for customizing**HPSTR**.
1313

14+
HPSTR now requires[Jekyll](http://jekyllrb.com/) 3.0. Make sure to run`bundle update` if you aren't on the latest version to update all gem dependencies.
15+
1416
##Basic Setup for a new Jekyll site
1517

1618
1.[Install Bundler](http://bundler.io)`gem install bundler` and then install[Jekyll](http://jekyllrb.com) and all dependencies`bundle install`.
@@ -31,55 +33,13 @@ General notes and suggestions for customizing **HPSTR**.
3133

3234
1. Clone the following folders:`_includes`,`_layouts`,`_sass`,`assets`, and`images`.
3335
2. Clone the following folders/files and personalize content as need:`about/`,`posts/`,`tags/`,`feed.xml` and`index.html`.
34-
3. Set the following variables in your`config.yml` file:
35-
36-
{% highlight yaml %}
37-
title: Site Title
38-
description: Describe your website here.
39-
disqus_shortname: shortname
40-
#Your site's domain goes here (eg: //mmistakes.github.io,http://mademistakes.com, etc)
41-
#When testing locally leave blank or usehttp://localhost:4000
42-
url: //mmistakes.github.io
43-
44-
#Owner/author information
45-
owner:
46-
name: Your Name
47-
avatar: avatar.jpg
48-
bio: "Your bio goes here. It shouldn't be super long but a good two sentences or two should suffice."
49-
email:you@email.com
50-
#Social networking links used in footer. Update and remove as you like.
51-
twitter:
52-
facebook:
53-
github:
54-
stackexchange:
55-
linkedin:
56-
instagram:
57-
flickr:
58-
tumblr:
59-
#google plus id, include the '+', eg +mmistakes
60-
google_plus: +yourid
61-
62-
#Analytics and webmaster tools stuff goes here
63-
google_analytics:
64-
google_verify:
65-
#https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
66-
bing_verify:
67-
68-
#http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
69-
timezone: America/New_York
70-
future: true
71-
pygments: true
72-
markdown: kramdown
73-
74-
#Amount of posts to show on home page
75-
paginate: 5
76-
{% endhighlight %}
36+
3. Edit`_config.yml` to personalize your site.
7737

7838
---
7939

8040
##Running Jekyll
8141

82-
If`jekyll build` and`jekyll serve` throw errors you may havetorun Jekyll with`bundle exec` instead.
42+
The preferred method for running Jekyll is with`bundle exec`, but if you're willing to deal gem conflicts feel freetogo cowboy witha`jekyll build` or`jekyll serve`.
8343

8444
>In some cases, running executables without bundle exec may work, if the executable happens to be installed in your system and does not pull in any gems that conflict with your bundle.
8545
>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp