From 50248d4d69b9c6213b75dc091c7de92ae2e2d286 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 14 Jun 2017 17:46:32 +0200 Subject: [PATCH] Fix template validity --- app/Resources/assets/style/part.scss | 7 ++++--- app/Resources/assets/style/set.scss | 8 ++++++-- app/Resources/views/macros/blocks.html.twig | 6 +++--- app/Resources/views/pagination/sortable_link.html.twig | 10 +++++----- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/Resources/assets/style/part.scss b/app/Resources/assets/style/part.scss index 67ac759..d06ceba 100644 --- a/app/Resources/assets/style/part.scss +++ b/app/Resources/assets/style/part.scss @@ -1,14 +1,15 @@ .part { .content { - padding: 7px !important; + padding: 0.5em !important; + overflow: hidden; .header { - font-size: 12px !important; + font-size: 1em !important; margin: 0; } .description { - font-size: 11px; + font-size: 0.9em; margin: 0 !important; } diff --git a/app/Resources/assets/style/set.scss b/app/Resources/assets/style/set.scss index d442f8c..3df8a8f 100644 --- a/app/Resources/assets/style/set.scss +++ b/app/Resources/assets/style/set.scss @@ -8,7 +8,11 @@ .set { .content .header { - font-size: 14px !important; - margin-bottom: 3px; + font-size: 1em !important; + margin-bottom: 0.1em; + } + .content { + padding: 0.5em !important; + overflow: hidden; } } \ No newline at end of file diff --git a/app/Resources/views/macros/blocks.html.twig b/app/Resources/views/macros/blocks.html.twig index 8dd852d..fee97ff 100644 --- a/app/Resources/views/macros/blocks.html.twig +++ b/app/Resources/views/macros/blocks.html.twig @@ -6,7 +6,7 @@ {% set placeholder = asset("resources/images/transparent_min.png") %} {% endif %} - + {{ number }} - image {% endmacro %} @@ -18,7 +18,7 @@ {% set placeholder = asset("resources/images/transparent_min.png") %} {% endif %} - + {{ number }} - image {% endmacro %} @@ -71,7 +71,7 @@ {{ set.name }}
- {{ set.id }} + {{ set.id }}
{% if set.theme is not null %} {{ set.theme.fullName }} diff --git a/app/Resources/views/pagination/sortable_link.html.twig b/app/Resources/views/pagination/sortable_link.html.twig index ba3deed..a8aae29 100644 --- a/app/Resources/views/pagination/sortable_link.html.twig +++ b/app/Resources/views/pagination/sortable_link.html.twig @@ -1,12 +1,12 @@ {% if options['class'] == 'asc' %} {% set icon = '' %} - {% set class = 'item active' %} + {% set options = (options)|merge({'class':'item active'}) %} {% elseif options['class'] == 'desc' %} - {% set icon = '' %} - {% set class = 'item active' %} + {% set icon = '' %} + {% set options = (options)|merge({'class':'item active'}) %} {% else %} {% set icon = null %} - {% set class = 'item' %} + {% set options = (options)|merge({'class':'item'}) %} {% endif %} -{{ icon|raw }} {{ title }} +{{ icon|raw }} {{ title }}