diff --git a/components/Collection/templates/collection/widget_add_to.html.twig b/components/Collection/templates/collection/widget_add_to.html.twig index 55fc3ebd6b..f5b65d1bd1 100644 --- a/components/Collection/templates/collection/widget_add_to.html.twig +++ b/components/Collection/templates/collection/widget_add_to.html.twig @@ -1,6 +1,6 @@
- +

{{ctitle}}

{% if has_collections %} @@ -8,9 +8,9 @@ {{ form(add_form) }}
-
- + {% trans %}Other options{% endtrans %}
diff --git a/components/LeftPanel/templates/left_panel/edit_feeds.html.twig b/components/LeftPanel/templates/left_panel/edit_feeds.html.twig index 161d2ba548..ca833ad5d4 100644 --- a/components/LeftPanel/templates/left_panel/edit_feeds.html.twig +++ b/components/LeftPanel/templates/left_panel/edit_feeds.html.twig @@ -5,36 +5,49 @@ {% endblock stylesheets %} +{% macro edit_feeds_form_row(child) %} +
+ {{ form_label(child) }} + {{ form_widget(child) }} +
+{% endmacro %} + {% block body %}
- -
- {{ "Edit feed navigation links" | trans }} - +

{{ "Edit feed navigation links" | trans }}

{# Since the form is not separated into individual groups, this happened #} {{ form_start(edit_feeds) }} {{ form_errors(edit_feeds) }} - {% for child in edit_feeds.children %} - {% if 'row_url' in child.vars.block_prefixes %} -
- {{ form_label(child) }} - {{ form_widget(child) }} +
+ {% for child in edit_feeds.children %} + {% if 'row_url' in child.vars.block_prefixes %} +
+ {{ _self.edit_feeds_form_row(child) }} {% elseif 'row_title' in child.vars.block_prefixes %} - {{ form_label(child) }} - {{ form_widget(child) }} + {{ _self.edit_feeds_form_row(child) }} {% elseif 'row_order' in child.vars.block_prefixes %} - {{ form_label(child) }} - {{ form_widget(child) }} + {{ _self.edit_feeds_form_row(child) }} {% elseif 'row_remove' in child.vars.block_prefixes %} - {{ form_label(child) }} - {{ form_widget(child) }} -
- {% endif %} - {% endfor %} + {{ _self.edit_feeds_form_row(child) }} +
+ {% endif %} + {% endfor %} +
+ +
+ {{ form_row(edit_feeds.update_exisiting) }} + {{ form_row(edit_feeds.reset) }} +
+ +
+ +
+

{% trans %}Add a new feed{% endtrans %}

+ {{ form_rest(edit_feeds) }} +
{{ form_end(edit_feeds) }} - diff --git a/plugins/WebMonetization/templates/WebMonetization/widget.html.twig b/plugins/WebMonetization/templates/WebMonetization/widget.html.twig index 89f1bac0da..c3a3f3ea74 100644 --- a/plugins/WebMonetization/templates/WebMonetization/widget.html.twig +++ b/plugins/WebMonetization/templates/WebMonetization/widget.html.twig @@ -1,6 +1,6 @@
- +

Web Monetization

diff --git a/public/assets/default_theme/css/widgets/sections.css b/public/assets/default_theme/css/widgets/sections.css index 99e148fa6b..9503bf06c5 100644 --- a/public/assets/default_theme/css/widgets/sections.css +++ b/public/assets/default_theme/css/widgets/sections.css @@ -57,7 +57,7 @@ .container-grid { display: grid; - gap: 10px; + gap: var(--s); grid-template-columns:repeat(auto-fit, minmax(200px, 1fr)); }