From 8e18fac95bbfe403bf1cfdeca614a99922d9dc23 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 25 Apr 2022 20:09:51 -0600 Subject: [PATCH 1/2] Revert "Move blueprint section headings and any section text within .form-section to simplify CSS selectors for custom admin styling (#2265)" This reverts commit c11594dd796cb815917b4620f57ff76d0f3bb0c6. --- .../forms/fields/section/section.html.twig | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/themes/grav/templates/forms/fields/section/section.html.twig b/themes/grav/templates/forms/fields/section/section.html.twig index 5cb0b88e..be38f824 100644 --- a/themes/grav/templates/forms/fields/section/section.html.twig +++ b/themes/grav/templates/forms/fields/section/section.html.twig @@ -3,18 +3,17 @@ {% block field %} {% if field.security is empty or authorize(array(field.security)) %} + {% if field.title or field.underline %} +

{{ field.title|t }}

+ {% endif %} + + {% if field.text %} +

{{ field.text|t|markdown|raw }}

+ {% endif %} + {% embed 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields} %} {% block outer_markup_field_open %}
- - {% if field.title or field.underline %} -

{{ field.title|t }}

- {% endif %} - - {% if field.text %} -
{{ field.text|t|markdown|raw }}
- {% endif %} - {% endblock %} {% block outer_markup_field_close %}
From d4c022b08d0539c1604db9cc683e4839f716feaa Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 25 Apr 2022 20:12:58 -0600 Subject: [PATCH 2/2] prepare for release --- CHANGELOG.md | 6 ++++++ blueprints.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 913f7e9f..da183e2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.10.33.1 +## 04/25/2022 + +1. [](#bugfix) + * Reverted [PR#2265](https://github.com/getgrav/grav-plugin-admin/pull/2265) as it broke sections output. + # v1.10.33 ## 04/25/2022 diff --git a/blueprints.yaml b/blueprints.yaml index 273393f6..4c7caa81 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,7 +1,7 @@ name: Admin Panel slug: admin type: plugin -version: 1.10.33 +version: 1.10.33.1 description: Adds an advanced administration panel to manage your site icon: empire author: