From 737e2e533164b76f4e4970858fae85d9c727eea8 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Fri, 30 Aug 2019 11:11:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20=D0=BC?= =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=B1=D0=BE=D0=BC=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/sculpin_kernel.yml | 2 +- source/_albums/white-sea.html.twig | 72 +++++++++--------- source/_albums/winter-fog.html.twig | 76 +++++++++---------- .../_assets/{components => index}/social.scss | 0 source/_assets/index/style.scss | 2 +- source/_assets/layout_album/style.scss | 20 ----- .../_assets/layout_internal/content-tags.scss | 4 + source/_layouts/album.html.twig | 11 --- 8 files changed, 80 insertions(+), 107 deletions(-) rename source/_assets/{components => index}/social.scss (100%) delete mode 100644 source/_assets/layout_album/style.scss delete mode 100644 source/_layouts/album.html.twig diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index bd2c6e0..5a5b450 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: album + layout: internal permalink: albums/:basename/ enabled: true taxonomies: diff --git a/source/_albums/white-sea.html.twig b/source/_albums/white-sea.html.twig index b42359b..cb6475b 100644 --- a/source/_albums/white-sea.html.twig +++ b/source/_albums/white-sea.html.twig @@ -4,58 +4,58 @@ description: Фотографии с поездок на Белое море в --- {% block content %} -
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

{% endblock %} diff --git a/source/_albums/winter-fog.html.twig b/source/_albums/winter-fog.html.twig index b2ae7db..f67a4aa 100644 --- a/source/_albums/winter-fog.html.twig +++ b/source/_albums/winter-fog.html.twig @@ -4,64 +4,64 @@ description: Фотографи набережной Седова, сделан --- {% block content %} -
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
+

-

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

-
- - +

+ + -

+

{% endblock %} diff --git a/source/_assets/components/social.scss b/source/_assets/index/social.scss similarity index 100% rename from source/_assets/components/social.scss rename to source/_assets/index/social.scss diff --git a/source/_assets/index/style.scss b/source/_assets/index/style.scss index 4dc50a7..e1b723e 100644 --- a/source/_assets/index/style.scss +++ b/source/_assets/index/style.scss @@ -13,7 +13,7 @@ } } - @import '../components/social'; + @import 'social'; } .hello { diff --git a/source/_assets/layout_album/style.scss b/source/_assets/layout_album/style.scss deleted file mode 100644 index 9a85cd7..0000000 --- a/source/_assets/layout_album/style.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import '../vars'; -@import '../base_style'; - -.album-content { - img { - max-width: 100%; - } - - .photo-item { - margin-bottom: 0.6em; - } - - .photo-link { - display: block; - } - - .photo-image { - display: block; - } -} diff --git a/source/_assets/layout_internal/content-tags.scss b/source/_assets/layout_internal/content-tags.scss index d4693da..5150b55 100644 --- a/source/_assets/layout_internal/content-tags.scss +++ b/source/_assets/layout_internal/content-tags.scss @@ -27,3 +27,7 @@ pre { code { font-family: $base-monospace-font-family; } + +img { + max-width: 100%; +} diff --git a/source/_layouts/album.html.twig b/source/_layouts/album.html.twig deleted file mode 100644 index d044718..0000000 --- a/source/_layouts/album.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends 'internal.html.twig' %} - -{% block css %} - -{% endblock %} - -{% block main %} -
- {% block content %}{% endblock %} -
-{% endblock %}