From e9c790048aa19a1631ee6157d4cd215a171a5d17 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Sun, 29 Apr 2018 12:36:39 +0300 Subject: [PATCH] Add wishlist page --- source/_assets/common/base_style.scss | 18 ++++++++++ source/_assets/layout_default/style.scss | 19 +--------- source/_assets/layout_internal/style.scss | 42 +++++++++++++++++++++++ source/_includes/head.twig | 10 ++++++ source/_layouts/default.html.twig | 11 +----- source/_layouts/internal.html.twig | 35 +++++++++++++++++++ source/index.html.twig | 3 ++ source/wishlist.twig | 23 +++++++++++++ webpack.config.js | 2 ++ 9 files changed, 135 insertions(+), 28 deletions(-) create mode 100644 source/_assets/common/base_style.scss create mode 100644 source/_assets/layout_internal/style.scss create mode 100644 source/_includes/head.twig create mode 100644 source/_layouts/internal.html.twig create mode 100644 source/wishlist.twig diff --git a/source/_assets/common/base_style.scss b/source/_assets/common/base_style.scss new file mode 100644 index 0000000..322ffd3 --- /dev/null +++ b/source/_assets/common/base_style.scss @@ -0,0 +1,18 @@ +html, +body { + font-size: 18px; + font-family: 'PT Serif', serif; + padding: 0; + margin: 0; + + @media (max-width: 839px) { + font-size: 16px; + } + + @media (max-width: 480px) { + margin: { + left: 15px; + right: 15px; + } + } +} diff --git a/source/_assets/layout_default/style.scss b/source/_assets/layout_default/style.scss index 308147b..81b83cf 100644 --- a/source/_assets/layout_default/style.scss +++ b/source/_assets/layout_default/style.scss @@ -1,21 +1,4 @@ -html, -body { - font-size: 18px; - font-family: 'PT Serif', serif; - padding: 0; - margin: 0; - - @media (max-width: 839px) { - font-size: 16px; - } - - @media (max-width: 480px) { - margin: { - left: 15px; - right: 15px; - } - } -} +@import '../common/base_style.scss'; .content { width: 840px; diff --git a/source/_assets/layout_internal/style.scss b/source/_assets/layout_internal/style.scss new file mode 100644 index 0000000..df13d9d --- /dev/null +++ b/source/_assets/layout_internal/style.scss @@ -0,0 +1,42 @@ +@import '../common/base_style.scss'; + +.navigation { + display: block; + border-bottom: 1px solid #eee; +} + +.navigation__actions { + list-style: none; + margin: 0; + padding: 0; +} + +.navigation__action { + display: inline-block; + margin: { + top: 1em; + bottom: 1em; + }; +} + +.navigation__link { + +} + +.page { + width: 840px; + margin: 0 auto; + + @media (max-width: 839px) { + margin: 20px 0; + width: auto; + } + + @media (max-width: 480px) { + margin: 10px 0; + width: auto; + } +} + +.content { +} diff --git a/source/_includes/head.twig b/source/_includes/head.twig new file mode 100644 index 0000000..3d105ce --- /dev/null +++ b/source/_includes/head.twig @@ -0,0 +1,10 @@ + + + + + {% if page.title is defined %} + {{ page.title }} - {{ site.title }} + {% else %} + {{ site.title }} + {% endif %} + diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index ee0b326..bbee56a 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,16 +1,7 @@ - - - - - {% if page.title is defined %} - {{ page.title }} - {{ site.title }} - {% else %} - {{ site.title }} - {% endif %} - + {% include 'head.twig' %} diff --git a/source/_layouts/internal.html.twig b/source/_layouts/internal.html.twig new file mode 100644 index 0000000..dde92ec --- /dev/null +++ b/source/_layouts/internal.html.twig @@ -0,0 +1,35 @@ + + + + {% include 'head.twig' %} + + + +
+ + + +
+ {% block content %}{% endblock %} +
+ +
+ + {% include 'counters.twig' %} + + + + {% block js %} + {# extra js scripts here #} + {% endblock %} + + + diff --git a/source/index.html.twig b/source/index.html.twig index ff7d89b..f637e52 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -26,6 +26,9 @@ layout: default
  • обо мне
    • +
  • + вишлист +

    • Написать

    diff --git a/source/wishlist.twig b/source/wishlist.twig new file mode 100644 index 0000000..34f5545 --- /dev/null +++ b/source/wishlist.twig @@ -0,0 +1,23 @@ +--- +layout: internal +--- +{% block content %} + +

    Вишлист

    + +

    Книги

    + + + +{% endblock %} diff --git a/webpack.config.js b/webpack.config.js index 0d83394..4b31e5f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,7 +11,9 @@ module.exports = income_env => { mode: is_prod ? 'production' : 'development', entry: { layout_default: './source/_assets/layout_default/style.scss', + layout_internal: './source/_assets/layout_internal/style.scss', about_me: './source/_assets/about_me/index.js', + // wishlist: './source/_assets/wishlist/index.js', }, output: { filename: '[name].js',