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

Commitd8456e0

Browse files
committed
Merge branch 'hotfix/1.7.0' into develop
2 parentsbd97490 +a06d7c9 commitd8456e0

15 files changed

+106
-305
lines changed

‎Gemfile‎

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

33
gem"json"
4-
gem"jekyll","~> 3.0"
4+
gem"jekyll"
55
gem"jekyll-sitemap"
6-
gem"octopress"
6+
gem"jekyll-feed"
77
gem"jekyll-paginate"
88
gem"jekyll-gist"

‎Gemfile.lock‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
GEM
22
remote:https://rubygems.org/
33
specs:
4-
addressable (2.3.8)
4+
addressable (2.4.0)
55
colorator (0.1)
66
faraday (0.9.2)
77
multipart-post (>=1.2,<3)
88
ffi (1.9.10)
9-
jekyll (3.1.1)
9+
ffi (1.9.10-x64-mingw32)
10+
jekyll (3.1.6)
1011
colorator (~>0.1)
1112
jekyll-sass-converter (~>1.0)
1213
jekyll-watch (~>1.1)
@@ -15,58 +16,46 @@ GEM
1516
mercenary (~>0.3.3)
1617
rouge (~>1.7)
1718
safe_yaml (~>1.0)
19+
jekyll-feed (0.5.1)
1820
jekyll-gist (1.4.0)
1921
octokit (~>4.2)
2022
jekyll-paginate (1.1.0)
2123
jekyll-sass-converter (1.4.0)
2224
sass (~>3.4)
2325
jekyll-sitemap (0.10.0)
24-
jekyll-watch (1.3.1)
25-
listen (~>3.0)
26-
kramdown (1.9.0)
26+
jekyll-watch (1.4.0)
27+
listen (~>3.0,<3.1)
28+
json (1.8.3)
29+
kramdown (1.11.1)
2730
liquid (3.0.6)
28-
listen (3.0.5)
29-
rb-fsevent (>=0.9.3)
30-
rb-inotify (>=0.9)
31-
mercenary (0.3.5)
31+
listen (3.0.8)
32+
rb-fsevent (~>0.9,>=0.9.4)
33+
rb-inotify (~>0.9,>=0.9.7)
34+
mercenary (0.3.6)
3235
multipart-post (2.0.0)
33-
octokit (4.2.0)
34-
sawyer (~>0.6.0,>=0.5.3)
35-
octopress (3.0.11)
36-
jekyll (>=2.0)
37-
mercenary (~>0.3.2)
38-
octopress-deploy
39-
octopress-escape-code (~>2.0)
40-
octopress-hooks (~>2.0)
41-
redcarpet (~>3.0)
42-
titlecase
43-
octopress-deploy (1.3.0)
44-
colorator
45-
octopress-escape-code (2.1.1)
46-
jekyll (~>3.0)
47-
octopress-hooks (2.6.1)
48-
jekyll (>=2.0)
36+
octokit (4.3.0)
37+
sawyer (~>0.7.0,>=0.5.3)
4938
rb-fsevent (0.9.7)
50-
rb-inotify (0.9.5)
39+
rb-inotify (0.9.7)
5140
ffi (>=0.5.0)
52-
redcarpet (3.3.4)
5341
rouge (1.10.1)
5442
safe_yaml (1.0.4)
55-
sass (3.4.21)
56-
sawyer (0.6.0)
57-
addressable (~>2.3.5)
43+
sass (3.4.22)
44+
sawyer (0.7.0)
45+
addressable (>=2.3.5,<2.5)
5846
faraday (~>0.8,<0.10)
59-
titlecase (0.1.1)
6047

6148
PLATFORMS
6249
ruby
50+
x64-mingw32
6351

6452
DEPENDENCIES
65-
jekyll (~>3.0)
53+
jekyll
54+
jekyll-feed
6655
jekyll-gist
6756
jekyll-paginate
6857
jekyll-sitemap
69-
octopress
58+
json
7059

7160
BUNDLED WITH
72-
1.11.2
61+
1.12.5

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ They say three times the charm, so here is another free responsive Jekyll theme
2222

2323
##Getting Started
2424

25-
HPSTR takes advantage of SCSS and data files to make customizing easier.These features require Jekyll2.x and will not work with older versionsof Jekyll.
25+
HPSTR takes advantage of SCSS and data files to make customizing easier.This theme requires Jekyll3.x and will not work with older versionsproperly.
2626

2727
To learn how to install and use this theme check out the[Setup Guide](https://mmistakes.github.io/hpstr-jekyll-theme/theme-setup/) for more information.

‎Rakefile.rb‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎_config.yml‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Describe your website here.
33
disqus_shortname:
44
reading_time:true
55
words_per_minute:200
6-
# Your site's domain goes here (eg: //mmistakes.github.io, http://mademistakes.com, etc)
6+
# Your site's domain goes here (eg:https://mmistakes.github.io, http://yourdomain.com, etc)
77
# When testing locally leave blank or use http://localhost:4000
88
url:
99

@@ -43,6 +43,7 @@ gems:
4343
-jekyll-sitemap
4444
-jekyll-paginate
4545
-jekyll-gist
46+
-jekyll-feed
4647
sass:
4748
sass_dir:_sass
4849
style:compressed
@@ -54,28 +55,35 @@ permalink: /:categories/:title/
5455
paginate:5
5556

5657
kramdown:
58+
input:GFM
5759
auto_ids:true
5860
footnote_nr:1
5961
entity_output:as_char
6062
toc_levels:1..6
6163
enable_coderay:false
6264

63-
coderay:
64-
coderay_line_numbers:nil
65-
coderay_line_numbers_start:1
66-
coderay_tab_width:4
67-
coderay_bold_every:10
68-
coderay_css:class
69-
70-
# Octopress
71-
# Default extensions
72-
post_ext:md
73-
page_ext:md
74-
# Found in _templates/
75-
post_layout:post
76-
page_layout:page
77-
# Format titles with titlecase?
78-
titlecase:true
79-
80-
include:[".htaccess"]
81-
exclude:["lib", "config.rb", "Capfile", "config", "Gemfile", "Gemfile.lock", "README.md", "LICENSE", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules"]
65+
include:
66+
-.htaccess
67+
exclude:
68+
-"*.less"
69+
-"*.sublime-project"
70+
-"*.sublime-workspace"
71+
-.asset-cache
72+
-.bundle
73+
-.jekyll-assets-cache
74+
-.sass-cache
75+
-CHANGELOG
76+
-Capfile
77+
-Gemfile
78+
-Gruntfile.js
79+
-LICENSE
80+
-README
81+
-Rakefile
82+
-config
83+
-gulpfile.js
84+
-lib
85+
-log
86+
-node_modules
87+
-package.json
88+
-spec
89+
-tmp

‎_posts/2011-03-10-sample-post.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ HTML and <abbr title="cascading stylesheets">CSS<abbr> are our tools. Mauris a a
7070

7171
##Code Snippets
7272

73-
Syntax highlighting viaPygments
73+
Syntax highlighting viaRouge
7474

75-
{% highlightcss %}
75+
```css
7676
#container {
7777
float:left;
7878
margin:0-240px00;
7979
width:100%;
8080
}
81-
{% endhighlight %}
81+
```
8282

8383
Non Pygments code example
8484

@@ -90,9 +90,9 @@ Non Pygments code example
9090

9191
Make any link standout more when applying the`.btn` class.
9292

93-
{% highlighthtml %}
93+
```html
9494
<ahref="#"class="btn btn-success">Success Button</a>
95-
{% endhighlight %}
95+
```
9696

9797
<divmarkdown="0"><ahref="#"class="btn">Primary Button</a></div>
9898
<divmarkdown="0"><ahref="#"class="btn btn-success">Success Button</a></div>

‎_posts/2013-05-22-sample-post-images.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ Here are some examples of what a post with images might look like. If you want t
2020

2121
Apply the`half` class like so to display two images side by side that share the same caption.
2222

23-
{% highlighthtml %}
23+
```html
2424
<figureclass="half">
2525
<imgsrc="/images/image-filename-1.jpg"alt="">
2626
<imgsrc="/images/image-filename-2.jpg"alt="">
2727
<figcaption>Caption describing these two images.</figcaption>
2828
</figure>
29-
{% endhighlight %}
29+
```
3030

3131
And you'll get something that looks like this:
3232

@@ -42,14 +42,14 @@ And you'll get something that looks like this:
4242

4343
Apply the`third` class like so to display three images side by side that share the same caption.
4444

45-
{% highlighthtml %}
45+
```html
4646
<figureclass="third">
4747
<ahref="http://placehold.it/1200x600.jpg"><imgsrc="http://placehold.it/600x300.jpg"alt=""></a>
4848
<ahref="http://placehold.it/1200x600.jpg"><imgsrc="http://placehold.it/600x300.jpg"alt=""></a>
4949
<ahref="http://placehold.it/1200x600.jpg"><imgsrc="http://placehold.it/600x300.jpg"alt=""></a>
5050
<figcaption>Caption describing these three images.</figcaption>
5151
</figure>
52-
{% endhighlight %}
52+
```
5353

5454
And you'll get something that looks like this:
5555

@@ -71,16 +71,14 @@ and fill the block with any number of links to images. You can mix relative and
7171

7272
Here is the block you might want to use:
7373

74-
{% highlight jinja %}
75-
{% raw %}
76-
{% capture images %}
74+
```liquid
75+
{% raw %}{% capture images %}
7776
/images/abstract-10.jpg
7877
/images/abstract-11.jpg
7978
http://upload.wikimedia.org/wikipedia/en/2/24/Lenna.png
8079
{% endcapture %}
81-
{% include gallery images=images caption="Test images" cols=3 %}
82-
{% endraw %}
83-
{% endhighlight %}
80+
{% include gallery images=images caption="Test images" cols=3 %}{% endraw %}
81+
```
8482

8583
Parameters:
8684

‎_posts/2013-06-25-video-post.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ description: "Custom written post descriptions are the way to go... if you're no
55
tags:[sample post, video]
66
---
77

8-
<iframewidth="560"height="315"src="//www.youtube.com/embed/SU3kYxJmWuQ"frameborder="0"></iframe>
8+
<iframewidth="560"height="315"src="//www.youtube.com/embed/SU3kYxJmWuQ"frameborder="0"></iframe>
99

1010
Video embeds are responsive and scale with the width of the main content block with the help of[FitVids](http://fitvidsjs.com/).
1111

12-
Not sure if this only effects Kramdown or if it's an issue with Markdown in general. But adding YouTube video embeds causes errors when building your Jekyll site. To fix add a space between the`<iframe>` tags and remove`allowfullscreen`. Example below:
13-
14-
{% highlight html %}
15-
<iframewidth="560"height="315"src="//www.youtube.com/embed/SU3kYxJmWuQ"frameborder="0"></iframe>
16-
{% endhighlight %}
12+
```html
13+
<iframewidth="560"height="315"src="//www.youtube.com/embed/SU3kYxJmWuQ"frameborder="0"></iframe>
14+
```

0 commit comments

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