From 6abf51be4ba6b44b0d348550e7fd6a073e9ff89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 5 Oct 2018 11:45:46 +0200 Subject: [PATCH] [export] layout of page "export list" --- CHANGELOG.md | 1 + .../modules/export-list/export-list.scss | 21 ++++++++++++++++ Resources/views/Export/layout.html.twig | 25 ++++++++----------- .../UI/notification_user_counter.html.twig | 2 +- chill.webpack.config.js | 1 + 5 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 Resources/public/modules/export-list/export-list.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index 6278f42a6..6fd31b832 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,4 +17,5 @@ Master branch ============= - fix error when interval is hour only +- layout of page "list exports" diff --git a/Resources/public/modules/export-list/export-list.scss b/Resources/public/modules/export-list/export-list.scss new file mode 100644 index 000000000..c1db247f1 --- /dev/null +++ b/Resources/public/modules/export-list/export-list.scss @@ -0,0 +1,21 @@ +.container-export { + margin-left: 1rem; + margin-right: 1rem; + + .export-list { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + + .export-list__element { + min-width: 18rem; + max-width: 20rem; + padding: 1rem; + margin: 1rem; + flex-grow: 1; + + border: 1px solid var(--chill-gray); + } + } +} \ No newline at end of file diff --git a/Resources/views/Export/layout.html.twig b/Resources/views/Export/layout.html.twig index 8a125d4f7..7eb8655d6 100644 --- a/Resources/views/Export/layout.html.twig +++ b/Resources/views/Export/layout.html.twig @@ -16,25 +16,21 @@ * along with this program. If not, see . #} -{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %} +{% extends "ChillMainBundle::layout.html.twig" %} {% block title %}{{ 'Exports list'|trans }}{% endblock %} -{% block vertical_menu_content %} - {{ chill_menu('export', { - 'layout': 'ChillMainBundle::Menu/export.html.twig', - }) }} -{% endblock %} -{% block layout_wvm_content %} - {% block export_content %} -

{{ 'Exports list'|trans }}

- +{% block content %} +