From 6a87e9017171db61c6a07d750676e7e8af15e0fc Mon Sep 17 00:00:00 2001 From: Thijs Kramer Date: Fri, 24 Mar 2017 10:47:56 +0100 Subject: [PATCH] Adjust the filter button height to match the height of the input fields next to it --- CHANGELOG.txt | 1 + docs/releases/1.10.rst | 1 + .../static_src/wagtailadmin/scss/components/_forms.scss | 5 +++++ .../templates/wagtailforms/index_submissions.html | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index aa05a406b6..2b0a9d67c2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -47,6 +47,7 @@ Changelog * Fix: List-based fields within form builder form submissions are now displayed as comma-separated strings rather than as Python lists (Christine Ho, Matt Westcott) * Fix: Ensure that page editor forms are submitted as multipart when file fields exist in InlinePanels (Wietze Helmantel) * Fix: The page type usage listing now have a translatable page title (Ramon de Jezus) + * Fix: Styles for submission filtering form now have a consistent height. (Thijs Kramer) 1.9 (16.02.2017) diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst index 79a27a0029..90359a7152 100644 --- a/docs/releases/1.10.rst +++ b/docs/releases/1.10.rst @@ -59,6 +59,7 @@ Bug fixes * List-based fields within form builder form submissions are now displayed as comma-separated strings rather than as Python lists (Christine Ho, Matt Westcott) * Ensure that page editor forms are submitted as multipart when file fields exist in InlinePanels (Wietze Helmantel) * The page type usage listing now have a translatable page title (Ramon de Jezus) + * Styles for submission filtering form now have a consistent height. (Thijs Kramer) Upgrade considerations diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss index 2c355f6a21..7fb88d7628 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss @@ -1127,6 +1127,11 @@ li.inline:first-child { .required .field > label:after { display: none; } + + .button-filter { + height: 2.71em; + border-color: transparent; + } } // file drop zones diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html index 08c297a7e1..84476aa150 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html @@ -99,7 +99,7 @@ {% include "wagtailadmin/shared/field_as_li.html" with field=field field_classes="field-small" li_classes="col4" %} {% endfor %}
  • - +