diff --git a/Gemfile.lock b/Gemfile.lock index 99a5d8a..66008f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GEM ffi (1.9.18) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (168) + github-pages (170) activesupport (= 4.2.9) github-pages-health-check (= 1.3.5) jekyll (= 3.6.2) @@ -33,11 +33,11 @@ GEM jekyll-gist (= 1.4.1) jekyll-github-metadata (= 2.9.3) jekyll-mentions (= 1.2.0) - jekyll-optional-front-matter (= 0.2.0) + jekyll-optional-front-matter (= 0.3.0) jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.1.0) + jekyll-readme-index (= 0.2.0) jekyll-redirect-from (= 0.12.1) - jekyll-relative-links (= 0.5.1) + jekyll-relative-links (= 0.5.2) jekyll-sass-converter (= 1.5.0) jekyll-seo-tag (= 2.3.0) jekyll-sitemap (= 1.1.1) @@ -55,7 +55,7 @@ GEM jekyll-theme-slate (= 0.1.0) jekyll-theme-tactile (= 0.1.0) jekyll-theme-time-machine (= 0.1.0) - jekyll-titles-from-headings (= 0.4.0) + jekyll-titles-from-headings (= 0.5.0) jemoji (= 0.8.1) kramdown (= 1.14.0) liquid (= 4.0.0) @@ -104,14 +104,14 @@ GEM activesupport (~> 4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) - jekyll-optional-front-matter (0.2.0) + jekyll-optional-front-matter (0.3.0) jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-readme-index (0.1.0) + jekyll-readme-index (0.2.0) jekyll (~> 3.0) jekyll-redirect-from (0.12.1) jekyll (~> 3.3) - jekyll-relative-links (0.5.1) + jekyll-relative-links (0.5.2) jekyll (~> 3.3) jekyll-sass-converter (1.5.0) sass (~> 3.4) @@ -160,7 +160,7 @@ GEM jekyll-theme-time-machine (0.1.0) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.4.0) + jekyll-titles-from-headings (0.5.0) jekyll (~> 3.3) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) @@ -217,4 +217,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/_includes/head.html b/_includes/head.html index 27ae41a..602fa59 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -3,7 +3,7 @@ - + @@ -12,21 +12,21 @@ {% seo %} {% feed_meta %} - + - + - + - - + + + + + + + diff --git a/_sass/post.scss b/_sass/post.scss index e67259c..5374b70 100644 --- a/_sass/post.scss +++ b/_sass/post.scss @@ -47,7 +47,6 @@ a.article-list__item__button { } } - .article { margin-bottom: 60px; } @@ -93,10 +92,10 @@ a.article-list__item__button { .article__content { -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; - font-feature-settings: "kern"; - -webkit-font-feature-settings: "kern"; - -moz-font-feature-settings: "kern"; - -moz-font-feature-settings: "kern=1"; + font-feature-settings: 'kern'; + -webkit-font-feature-settings: 'kern'; + -moz-font-feature-settings: 'kern'; + -moz-font-feature-settings: 'kern=1'; p { font-size: 20px; diff --git a/css/index.scss b/css/index.scss index 48a0a9d..4413570 100644 --- a/css/index.scss +++ b/css/index.scss @@ -10,7 +10,7 @@ body { width: 800px; margin: 0 auto; padding: 0 20px; - font-family: 'PT Serif', "ヒラギノ明朝 ProN", "Hiragino Mincho ProN", serif; + font-family: 'ten-mincho', "ヒラギノ明朝 ProN", "Hiragino Mincho ProN", serif; @media screen and (max-width: $break-large) { width: auto; @@ -131,4 +131,8 @@ hr { } } +.header, .metro { + font-family: "PT Serif", serif; +} + @import 'post'