From dccbfd6764c75fe38f9cb5d9705311006dec1238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 28 Nov 2018 00:06:27 +0100 Subject: [PATCH] Drobne bugfixy --- src/app.js | 2 + src/assets/scss/boxes.scss | 8 ++- src/views/editor/gallery_detail.ejs | 22 +++----- .../editor/modals/editGalleryText.ejs | 51 +++++++++++-------- src/views/partials/program-icons.ejs | 4 +- 5 files changed, 48 insertions(+), 39 deletions(-) diff --git a/src/app.js b/src/app.js index 8dea84b..8e8746c 100644 --- a/src/app.js +++ b/src/app.js @@ -44,6 +44,8 @@ var templateData = { {name: "Ukol 3", done: true}, {name: "Ukol 4", done: false}, ], + galleryText: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", + galleryName: "Svatební cesta", aboutUs: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", notes: "", wedding: { diff --git a/src/assets/scss/boxes.scss b/src/assets/scss/boxes.scss index fbe58e8..982f35e 100644 --- a/src/assets/scss/boxes.scss +++ b/src/assets/scss/boxes.scss @@ -7,7 +7,13 @@ padding: 20px; } - &__item { + @media (max-width: 1100px) { + &__container { + column-count: 1; + } + } + + &__item { margin-bottom: 20px; } diff --git a/src/views/editor/gallery_detail.ejs b/src/views/editor/gallery_detail.ejs index 81fcf90..3c1de4a 100644 --- a/src/views/editor/gallery_detail.ejs +++ b/src/views/editor/gallery_detail.ejs @@ -1,45 +1,37 @@
-

Nadpis alba

+

<%= galleryName %>

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et - dolore - magna aliqua. Ut enim ad minim veniam, quis - nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in - reprehenderit in voluptate velit esse cillum dolore eu fugiat - nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit - anim - id est laborum.

+ <%- galleryText %>
<% include ../partials/editor/modals/editGalleryText.ejs %> - <%- include('../partials/notification.ejs', {parameter: "upload"}) %> diff --git a/src/views/partials/editor/modals/editGalleryText.ejs b/src/views/partials/editor/modals/editGalleryText.ejs index b50d17f..a6064eb 100644 --- a/src/views/partials/editor/modals/editGalleryText.ejs +++ b/src/views/partials/editor/modals/editGalleryText.ejs @@ -1,27 +1,36 @@ \ No newline at end of file diff --git a/src/views/partials/program-icons.ejs b/src/views/partials/program-icons.ejs index deda423..7f1d931 100644 --- a/src/views/partials/program-icons.ejs +++ b/src/views/partials/program-icons.ejs @@ -2,7 +2,7 @@