From b0f76a736c8b39d976e9df6fb4d526247c9f3f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Tue, 9 Jan 2024 13:11:09 +0100
Subject: [PATCH] fix filtering UI
---
.../styleguide2/includes/atoms/tags/tag.html | 4 ++--
.../styleguide2/includes/molecules/tags/tags.html | 13 ++++++++++++-
.../organisms/header/elections/articles_header.html | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/shared/templates/styleguide2/includes/atoms/tags/tag.html b/shared/templates/styleguide2/includes/atoms/tags/tag.html
index 63e08459..93c57a0a 100644
--- a/shared/templates/styleguide2/includes/atoms/tags/tag.html
+++ b/shared/templates/styleguide2/includes/atoms/tags/tag.html
@@ -11,8 +11,8 @@
"
style="
{% if filtered_tag and filtered_tag.id == id %}
- background:white!important;
- text-color:black
+ background:white !important;
+ color:black !important;
{% endif %}
"
>
diff --git a/shared/templates/styleguide2/includes/molecules/tags/tags.html b/shared/templates/styleguide2/includes/molecules/tags/tags.html
index 1834ef3d..b4204e93 100644
--- a/shared/templates/styleguide2/includes/molecules/tags/tags.html
+++ b/shared/templates/styleguide2/includes/molecules/tags/tags.html
@@ -5,7 +5,18 @@
</div>
{% if filtered_tag %}
- <a href="?tag_id=" class="text-white pb-6 underline">
+ <a
+ href="?tag_id="
+ class="
+ {% if reset_classes %}
+ {{ reset_classes }}
+ {% else %}
+ text-white
+ {% endif %}
+
+ pb-6 underline
+ "
+ >
Resetovat štítky
</a>
{% endif %}
diff --git a/shared/templates/styleguide2/includes/organisms/header/elections/articles_header.html b/shared/templates/styleguide2/includes/organisms/header/elections/articles_header.html
index 3bf41a65..1379dab5 100644
--- a/shared/templates/styleguide2/includes/organisms/header/elections/articles_header.html
+++ b/shared/templates/styleguide2/includes/organisms/header/elections/articles_header.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block after_heading %}
- {% include 'styleguide2/includes/molecules/tags/tags.html' with classes='mb-4' tag_color_classes='bg-black text-white' tags_are_selectable=True %}
+ {% include 'styleguide2/includes/molecules/tags/tags.html' with classes='mb-4' tag_color_classes='bg-black text-white' reset_classes='text-black' tags_are_selectable=True %}
<form
class="flex justify-start"
--
GitLab