Skip to content
Snippets Groups Projects
Commit dfef3e2e authored by Alexa Valentová's avatar Alexa Valentová
Browse files

run hooks, unify tag/button color classes, nicer program layout

parent e8b8100d
No related branches found
No related tags found
2 merge requests!1141Release,!1140run hooks, unify tag/button color classes, nicer program layout
Pipeline #19771 passed
Showing
with 26 additions and 28 deletions
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -8,17 +8,15 @@ ...@@ -8,17 +8,15 @@
{% if color_classes %} {% if color_classes %}
{{ color_classes }} {{ color_classes }}
{% else %} {% else %}
text-black bg-yellow-500 {% if tags_are_selectable %}hover:bg-yellow-600{% endif %} text-black {% if filtered_tag and filtered_tag.id == id and not is_outside_header %}
bg-pirati-yellow hover:bg-yellow-600
{% else %}
bg-white {% if tags_are_selectable %}hover:bg-pirati-yellow{% endif %}
{% endif %}
{% endif %} {% endif %}
px-4 py-2 duration-200 hover:no-underline px-4 py-2 duration-200 hover:no-underline
" "
style="
{% if filtered_tag and filtered_tag.id == id %}
background:white !important;
color:black !important;
{% endif %}
"
> >
{{ text }} {{ text }}
{% if tags_are_selectable %} {% if tags_are_selectable %}
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
{% else %} {% else %}
<div <div
{% endif %} {% endif %}
class="hover:no-underline mb-12 flex gap-3 max-w-4xl items-start" class="hover:no-underline mb-12 flex gap-3 items-start"
> >
{% if icon %} {% if icon %}
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<h3 class="font-alt mb-4 text-4xl"> <h3 class="font-alt mb-4 text-4xl">
{{ title }} {{ title }}
</h3> </h3>
<div class="prose [&>div.content-block>p:first-child]:mt-0"> <div class="prose max-w-none [&>div.content-block>p:first-child]:mt-0">
{{ text|richtext }} {{ text|richtext }}
</div> </div>
</div> </div>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
> >
{% if self.perex %} {% if self.perex %}
<div class="mb-12"> <div class="mb-12">
<div class="prose"> <div class="prose max-w-none">
{{ self.perex|richtext }} {{ self.perex|richtext }}
</div> </div>
</div> </div>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
{% elif block_type == "elections_program" %} {% elif block_type == "elections_program" %}
<div class="mb-12"> <div class="mt-6 mb-12 xl:mb-20 container--wide">
{{ self.program_page.get_main_page_program_render|safe }} {{ self.program_page.get_main_page_program_render|safe }}
</div> </div>
{% elif block_type == "program_group_with_candidates" %} {% elif block_type == "program_group_with_candidates" %}
......
<div class="flex gap-3 flex-wrap {{ classes }}"> <div class="flex gap-3 flex-wrap {{ classes }}">
{% for tag in tags %} {% for tag in tags %}
{% include 'styleguide2/includes/atoms/tags/tag.html' with text=tag.name id=tag.id %} {% include 'styleguide2/includes/atoms/tags/tag.html' with text=tag.name id=tag.id is_outside_header=True %}
{% endfor %} {% endfor %}
</div> </div>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
{% endblock %} {% endblock %}
{% block after_heading %} {% block after_heading %}
{% include 'styleguide2/includes/molecules/tags/tags.html' with classes='mb-4' tag_color_classes='bg-black text-white' size_classes='' reset_classes='text-black' tags_are_selectable=True extra_tag=filtered_tag %} {% include 'styleguide2/includes/molecules/tags/tags.html' with classes='mb-4' tag_color_classes='' size_classes='' reset_classes='text-black' tags_are_selectable=True extra_tag=filtered_tag %}
<form <form
class="flex justify-start" class="flex justify-start"
......
{% extends 'styleguide2/includes/organisms/header/elections/simple_header.html' %} {% extends 'styleguide2/includes/organisms/header/elections/simple_header.html' %}
{% block after_heading %} {% block after_heading %}
{% include 'styleguide2/includes/molecules/tags/tags.html' with classes='mb-4' tag_color_classes='bg-black text-white' %} {% include 'styleguide2/includes/molecules/tags/tags.html' with classes='mb-4' tag_color_classes='' %}
{% endblock %} {% endblock %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment