From 50423c09a8163327f61ed47485c2659f97c3c4df Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Fri, 16 Jun 2017 15:01:40 -0400 Subject: [PATCH] Use Poole v2 https://github.com/poole/hyde/pull/97 --- .gitignore | 1 + 404.html | 2 +- _config.yml | 18 +- _includes/head.html | 15 +- _layouts/default.html | 6 +- _layouts/page.html | 4 +- _layouts/post.html | 16 +- _sass/_base.scss | 78 ++++ _sass/_code.scss | 78 ++++ public/css/hyde.css => _sass/_hyde.scss | 0 _sass/_layout.scss | 15 + _sass/_masthead.scss | 26 ++ _sass/_message.scss | 11 + _sass/_pagination.scss | 52 +++ _sass/_posts.scss | 61 +++ public/css/syntax.css => _sass/_syntax.scss | 0 _sass/_type.scss | 117 +++++ about.md | 4 +- atom.xml | 6 +- index.html | 18 +- ...d.png => apple-touch-icon-precomposed.png} | Bin public/css/poole.css | 430 ------------------ styles.scss | 29 ++ 23 files changed, 513 insertions(+), 474 deletions(-) create mode 100644 _sass/_base.scss create mode 100644 _sass/_code.scss rename public/css/hyde.css => _sass/_hyde.scss (100%) create mode 100644 _sass/_layout.scss create mode 100644 _sass/_masthead.scss create mode 100644 _sass/_message.scss create mode 100644 _sass/_pagination.scss create mode 100644 _sass/_posts.scss rename public/css/syntax.css => _sass/_syntax.scss (100%) create mode 100644 _sass/_type.scss rename public/{apple-touch-icon-144-precomposed.png => apple-touch-icon-precomposed.png} (100%) delete mode 100644 public/css/poole.css create mode 100644 styles.scss diff --git a/.gitignore b/.gitignore index 10c58cf685c..33c0adbab2d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ _gh_pages _site .ruby-version +.sass-cache # Numerous always-ignore extensions *.diff diff --git a/404.html b/404.html index 64f84bd90ec..fe839f57f1c 100644 --- a/404.html +++ b/404.html @@ -7,5 +7,5 @@

404: Page not found

-

Кажется, вы пришли по кривой ссылке. Самая прямая дорога — домой.

+

Кажется, вы пришли по кривой ссылке. Самая прямая дорога — домой.

diff --git a/_config.yml b/_config.yml index 89870ac8a35..463038c999e 100644 --- a/_config.yml +++ b/_config.yml @@ -1,26 +1,32 @@ # Dependencies -#markdown: redcarpet highlighter: rouge # Permalinks permalink: pretty -#relative_permalinks: true # Setup title: Pimp my Keenetic -tagline: 'Стартуй! Прокачай!' -description: 'Использование роутера ZyXEL за пределами веб-интерфейса, в т.ч. вместе с дополнительным ПО из репозитория Entware-ng.' +tagline: Стартуй! Прокачай! +description: 'Использование роутера ZyXEL за пределами веб-интерфейса, в т.ч. вместе с ПО из репозитория Entware-ng.' url: http://keenetic-gi.ga -baseurl: / +baseurl: "" author: name: 'Alexander Ryzhov' url: https://github.com/ryzhovau + email: keenetic@ryzhov-al.ru + +# Assets +# +# We specify the directory for Jekyll so we can use @imports. +sass: + sass_dir: _sass + style: :compressed paginate: 5 # Custom vars -version: 2.1.0 +version: 3.0.0 github: repo: https://github.com/PimpMyKeenetic/PimpMyKeenetic.github.io diff --git a/_includes/head.html b/_includes/head.html index e2b070e242a..556bcf79d24 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,10 +1,9 @@ + - - - + {% if page.title == "Home" %} @@ -15,15 +14,13 @@ - - - + - - + + - + diff --git a/_layouts/default.html b/_layouts/default.html index 1f2ec7fcd13..8619ee9ea40 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,5 +1,5 @@ - + {% include head.html %} @@ -7,9 +7,9 @@ {% include sidebar.html %} -
+
{{ content }} -
+