From 36df0cfe65c9ba790d551cef0161ee27bea2581e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Valentov=C3=A1?= <git@imaniti.org>
Date: Mon, 22 Jul 2024 17:47:52 +0200
Subject: [PATCH] popout point layout fix
---
.../includes/molecules/popouts/popout_point.html | 2 +-
.../organisms/popouts/district/program_popout_list.html | 2 +-
.../includes/organisms/popouts/hoax_popout_list.html | 8 ++++----
.../includes/organisms/popouts/popout_list.html | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/shared/templates/styleguide2/includes/molecules/popouts/popout_point.html b/shared/templates/styleguide2/includes/molecules/popouts/popout_point.html
index 945499be..d44831f9 100644
--- a/shared/templates/styleguide2/includes/molecules/popouts/popout_point.html
+++ b/shared/templates/styleguide2/includes/molecules/popouts/popout_point.html
@@ -1,6 +1,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
-{% if block %}
+{% if not is_outside_block %}
<div
class="
{% if not page.root_page.content_is_full_width %}
diff --git a/shared/templates/styleguide2/includes/organisms/popouts/district/program_popout_list.html b/shared/templates/styleguide2/includes/organisms/popouts/district/program_popout_list.html
index 0ca87d43..287568ea 100644
--- a/shared/templates/styleguide2/includes/organisms/popouts/district/program_popout_list.html
+++ b/shared/templates/styleguide2/includes/organisms/popouts/district/program_popout_list.html
@@ -53,7 +53,7 @@
</div>
{% for point in category.points %}
- {% include 'patterns/molecules/popouts/popout_point.html' with name=point.name text=point.content %}
+ {% include 'patterns/molecules/popouts/popout_point.html' with name=point.name text=point.content with is_outside_block=True %}
{% endfor %}
</li>
{% endfor %}
diff --git a/shared/templates/styleguide2/includes/organisms/popouts/hoax_popout_list.html b/shared/templates/styleguide2/includes/organisms/popouts/hoax_popout_list.html
index 1a583ef5..c41e386f 100644
--- a/shared/templates/styleguide2/includes/organisms/popouts/hoax_popout_list.html
+++ b/shared/templates/styleguide2/includes/organisms/popouts/hoax_popout_list.html
@@ -1,6 +1,6 @@
<ul class="flex flex-col">
- <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" %}</li>
- <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" %}</li>
- <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" %}</li>
- <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" %}</li>
+ <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" with is_outside_block=True %}</li>
+ <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" with is_outside_block=True %}</li>
+ <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" with is_outside_block=True %}</li>
+ <li class="grow">{% include "styleguide2/includes/molecules/popouts/hoax_popout_point.html" with is_outside_block=True %}</li>
</ul>
diff --git a/shared/templates/styleguide2/includes/organisms/popouts/popout_list.html b/shared/templates/styleguide2/includes/organisms/popouts/popout_list.html
index 0a90cffa..bc3ee26f 100644
--- a/shared/templates/styleguide2/includes/organisms/popouts/popout_list.html
+++ b/shared/templates/styleguide2/includes/organisms/popouts/popout_list.html
@@ -24,7 +24,7 @@
{% endif %}
{% for point in category.point_list %}
- {% include 'styleguide2/includes/molecules/popouts/popout_point.html' with name=point.title content=point.content guarantor_page=point.guarantor %}
+ {% include 'styleguide2/includes/molecules/popouts/popout_point.html' with name=point.title content=point.content guarantor_page=point.guarantor with is_outside_block=True %}
{% endfor %}
</li>
{% endfor %}
--
GitLab