diff --git a/app/assets/stylesheets/govuk-frontend/overrides.scss b/app/assets/stylesheets/govuk-frontend/overrides.scss index fa6a83756..2da9a715e 100644 --- a/app/assets/stylesheets/govuk-frontend/overrides.scss +++ b/app/assets/stylesheets/govuk-frontend/overrides.scss @@ -18,3 +18,13 @@ .govuk-main-wrapper { position: relative; } + +// Additional padding-bottom override, following the GOV.UK Frontend spacing scale: +// https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale +.govuk-\!-padding-bottom-12 { + padding-bottom: 70px; + + @include govuk-media-query($from: tablet) { + padding-bottom: 90px; + } +} diff --git a/app/templates/fullwidth_template.html b/app/templates/fullwidth_template.html index 9ed74ee0f..a7bda13de 100644 --- a/app/templates/fullwidth_template.html +++ b/app/templates/fullwidth_template.html @@ -1,5 +1,7 @@ {% extends "admin_template.html" %} +{% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %} + {% block main %} {% block beforeContent %}{% endblock %}
diff --git a/app/templates/org_template.html b/app/templates/org_template.html index b0031c118..32bbdab14 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -15,13 +15,13 @@ Switch service -
+
{% include "org_nav.html" %}
{% block beforeContent %}{% endblock %} -
+
{% block content %} {% include 'flash_messages.html' %} {% block maincolumn_content %}{% endblock %} diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index 41dc9b3fb..106547f91 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -1,5 +1,7 @@ {% extends "admin_template.html" %} +{% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %} + {% block per_page_title %} {% block service_page_title %}{% endblock %} – {{ current_service.name }} {% endblock %} @@ -18,18 +20,18 @@
Switch service
-
+
{% if help %}
{% else %}
{% endif %} - {% include "main_nav.html" %} -
+ {% include "main_nav.html" %} +
{% if help %} -
+
{% else %} -
+
{% endif %} {% block beforeContent %}{% endblock %}
diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html index 74362fd87..6ee5d9a47 100644 --- a/app/templates/withoutnav_template.html +++ b/app/templates/withoutnav_template.html @@ -1,5 +1,7 @@ {% extends "admin_template.html" %} +{% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-12" %} + {% block beforeContent %} {% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %}