From 7d3a812641f16bc618e35e79835e21d5b5e1bec5 Mon Sep 17 00:00:00 2001 From: Helen C Date: Wed, 8 Nov 2023 12:23:31 +0000 Subject: [PATCH] Make work and thinking blocks full width by sitting outside the proposition-section div, and ensure the 'more' buttons align --- .../patterns/molecules/streamfield/blocks/thinking.html | 2 +- .../patterns/organisms/latest-posts/latest-posts.html | 2 +- .../templates/patterns/pages/proposition/proposition.html | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/thinking.html b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/thinking.html index c436c080f..f2980ddce 100644 --- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/thinking.html +++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/thinking.html @@ -1,3 +1,3 @@ {% load wagtailcore_tags %} -{% include "patterns/organisms/latest-posts/latest-posts.html" with blogs_section_title=value.title classes="service-section" feature_first=True data_attrs="data-service-section" filter_by=page.filter_by wide=wide hide_title=hide_title %} +{% include "patterns/organisms/latest-posts/latest-posts.html" with blogs_section_title=value.title classes="service-section" feature_first=True data_attrs="data-service-section" filter_by=page.filter_by hide_title=hide_title %} diff --git a/tbx/project_styleguide/templates/patterns/organisms/latest-posts/latest-posts.html b/tbx/project_styleguide/templates/patterns/organisms/latest-posts/latest-posts.html index f7faa8327..03b37d118 100644 --- a/tbx/project_styleguide/templates/patterns/organisms/latest-posts/latest-posts.html +++ b/tbx/project_styleguide/templates/patterns/organisms/latest-posts/latest-posts.html @@ -5,7 +5,7 @@ {% elif blogs_section_title %}id="{{ blogs_section_title|slugify }}"{% endif %} {% if data_attrs %}{{ data_attrs }}{% endif %} > -
+
{% if page.blogs_section_title and not hide_title %} {% include "patterns/atoms/section-title/section-title.html" with title=page.blogs_section_title %} {% elif blogs_section_title and not hide_title %} diff --git a/tbx/project_styleguide/templates/patterns/pages/proposition/proposition.html b/tbx/project_styleguide/templates/patterns/pages/proposition/proposition.html index fe1134033..991e07192 100644 --- a/tbx/project_styleguide/templates/patterns/pages/proposition/proposition.html +++ b/tbx/project_styleguide/templates/patterns/pages/proposition/proposition.html @@ -73,8 +73,9 @@

{# there is just one block allowed #}

{{ page.our_work_section_body.0.value.title }}

- {% include_block page.our_work_section_body with hide_title=True %}
+ {# work block sits outside the proposition-section wrapper as it is full-width #} + {% include_block page.our_work_section_body with hide_title=True %} {% endif %} {# Our thinking section #} @@ -82,8 +83,9 @@

{{ page.our_work_section_body.0.value.ti
{# there is just one block allowed #}

{{ page.our_thinking_section_body.0.value.title }}

- {% include_block page.our_thinking_section_body with wide=True hide_title=True %}
+ {# our thinking block sits outside the proposition-secion wrapper as it has it's own left and right padding, and so the 'more' button aligns with the one under 'work' above #} + {% include_block page.our_thinking_section_body with hide_title=True %} {% endif %} {% endblock %}