Merge pull request #5832 from alphagov/remove-spacing-flash-banner

Remove extra spacing around flash banner

Author: quis

app/main/views/manage_users.py

@@ -32,6 +32,7 @@ def manage_users(service_id):
         show_search_box=(len(current_service.team_members) > 7),
         form=SearchUsersForm(),
         permissions=permission_options,
+        extra_spacing_around_flash_messages=False,
     )
 
 

app/main/views/templates.py

@@ -131,6 +131,7 @@ def view_template(service_id, template_id):
         template=template,
         user_has_template_permission=user_has_template_permission,
         content_count_message=content_count_message,
+        extra_spacing_around_flash_messages=False,
     )
 
 

app/templates/flash_messages.html

@@ -19,7 +19,12 @@
       {% else %}
         {% set delete_button_text = None %}
       {% endif %}
+      {% if extra_spacing_around_flash_messages is not defined %}
+        {% set extra_spacing_around_flash_messages = True %}
+      {% endif %}
+      {% if extra_spacing_around_flash_messages %}
       <div class="bottom-gutter">
+      {% endif %}
         {{ banner(
           message if message is string else message[0],
           'default' if ((category == 'default') or (category == 'default_with_tick')) else 'dangerous',
@@ -28,7 +33,9 @@
           context=message[1] if message is not string,
           thing=message[2] if message is not string and message[2]
         )}}
+      {% if extra_spacing_around_flash_messages %}
       </div>
+      {% endif %}
     {% endfor %}
   {% endif %}
 {% endwith %}