diff --git a/Makefile b/Makefile index 470d75a..383f0bc 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,6 @@ format: ./tools/npm run format-js ./tools/npm run format-vue ./tools/npm run format-style - ./tools/npm run format-md format-php: ./tools/php-cs-fixer fix diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index 506cb06..bb3e2c9 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -9,7 +9,7 @@ sculpin_content_types: type: path path: _albums singular_name: album - layout: internal + layout: album permalink: albums/:basename/ enabled: true taxonomies: diff --git a/source/_albums/white-sea.html.twig b/source/_albums/white-sea.html.twig new file mode 100644 index 0000000..109ab29 --- /dev/null +++ b/source/_albums/white-sea.html.twig @@ -0,0 +1,61 @@ +--- +title: Белое море - 2011, 2013 года +description: Фотографии с поездок на Белое море в самую короткую ночь в году +--- +{% block content %} + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +{% endblock %} diff --git a/source/_assets/layout_album/style.scss b/source/_assets/layout_album/style.scss new file mode 100644 index 0000000..0d0a33c --- /dev/null +++ b/source/_assets/layout_album/style.scss @@ -0,0 +1,8 @@ +@import '../vars'; +@import '../base_style'; + +.album-content { + img { + max-width: 100%; + } +} diff --git a/source/_assets/layout_internal/navigation.scss b/source/_assets/layout_internal/navigation.scss index 635266b..9dcad97 100644 --- a/source/_assets/layout_internal/navigation.scss +++ b/source/_assets/layout_internal/navigation.scss @@ -1,6 +1,7 @@ .navigation { display: block; border-bottom: 1px solid #eee; + margin-bottom: 1em; &__actions { list-style: none; @@ -13,6 +14,7 @@ margin: { top: 1em; bottom: 1em; + right: 1em; } } diff --git a/source/_includes/navigation.twig b/source/_includes/navigation.twig index fb9c266..ef43413 100644 --- a/source/_includes/navigation.twig +++ b/source/_includes/navigation.twig @@ -3,5 +3,8 @@
  • Главная
    • +
  • + Альбомы +
    • diff --git a/source/_layouts/album.html.twig b/source/_layouts/album.html.twig new file mode 100644 index 0000000..ba7f8f6 --- /dev/null +++ b/source/_layouts/album.html.twig @@ -0,0 +1,11 @@ +{% extends 'internal.html.twig' %} + +{% block css %} + +{% endblock %} + +{% block main %} +
    + {% block content %}{% endblock %} +
    +{% endblock %} diff --git a/source/_layouts/internal.html.twig b/source/_layouts/internal.html.twig index 1956fa4..a435eb0 100644 --- a/source/_layouts/internal.html.twig +++ b/source/_layouts/internal.html.twig @@ -13,9 +13,11 @@ {% include 'navigation.twig' %} -
    - {% block content %}{% endblock %} -
    + {% block main %} +
    + {% block content %}{% endblock %} +
    + {% endblock %} diff --git a/source/albums.html.twig b/source/albums.html.twig new file mode 100644 index 0000000..ae6d875 --- /dev/null +++ b/source/albums.html.twig @@ -0,0 +1,17 @@ +--- +layout: internal +title: Фотоальбомы +description: Фотоальбомы +use: [albums] +--- +{% block content %} + +

    {{ title }}

    + + + +{% endblock %} diff --git a/source/index.html.twig b/source/index.html.twig index 3359705..68ceb92 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -20,6 +20,13 @@ description: Личный сайт Антона Вахрушева +

    Смотреть

    + +

    Читать