amélioration du rendu bouton

This commit is contained in:
Jean-Marie Favreau 2023-11-05 10:07:30 +01:00
parent 923f64a66a
commit 8e1d7311a3
6 changed files with 27 additions and 15 deletions

View File

@ -38,21 +38,23 @@ $primary-700: #008080;
width: 1.2em; width: 1.2em;
border-radius: 0.6em; border-radius: 0.6em;
display: inline-block; display: inline-block;
color: $primary-500;
background: var(--secondary-inverse);
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
font-size: 80%; font-size: 80%;
} }
.action {
color: $primary-500;
background: var(--secondary-inverse);
}
.cat { .cat {
margin-left: 0; margin-left: 0;
margin-right: .2em; margin-right: .2em;
} }
a:hover>.cat,
a:hover>.action, a:hover>.action,
span:hover>.cat,
span:hover>.action { span:hover>.action {
transition: color var(--transition); transition: color var(--transition);
color: $primary-600; color: $primary-600;

View File

@ -26,8 +26,12 @@
</header> </header>
{% endif %} {% endif %}
{% comment %}
manque encore:
* location,
* image, image_alt
* reference_urls
{% endcomment %}
{% comment %} {% comment %}
On affiche le corps du message avec plus ou moins de longueur On affiche le corps du message avec plus ou moins de longueur

View File

@ -3,6 +3,11 @@
{% block title %}{{ object.title }}{% endblock %} {% block title %}{{ object.title }}{% endblock %}
{% block entete_header %}
{% css_categories %}
{% endblock %}
{% block content %} {% block content %}
{% include "agenda_culturel/event-inc.html" with event=event %} {% include "agenda_culturel/event-inc.html" with event=event %}

View File

@ -5,12 +5,15 @@
{% load cat_extra %} {% load cat_extra %}
{% block content %} {% block entete_header %}
{% css_categories %}
{% endblock %}
{% block content %}
<h1>Étiquette <em>{{ tag }}</em></h1> <h1>Étiquette <em>{{ tag }}</em></h1>
{% for event in events %} {% for event in events %}
{% include "agenda_culturel/event-inc.html" with event=event display="in list" %} {% include "agenda_culturel/event-inc.html" with event=event display="in list" %}
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}

View File

@ -4,9 +4,7 @@
{% load cat_extra %} {% load cat_extra %}
{% block content %} {% block content %}
<h1>Toutes les étiquettes</h1> <h1>Toutes les étiquettes</h1>
<p>Liste de toutes les étiquettes utilisées par les événements référencés&nbsp;:</p> <p>Liste de toutes les étiquettes utilisées par les événements référencés&nbsp;:</p>
<div> <div>
@ -14,5 +12,4 @@
<a href="{% url 'view_tag' tag %}" role="button" class="small-cat">{{ tag }}</a> <a href="{% url 'view_tag' tag %}" role="button" class="small-cat">{{ tag }}</a>
{% endfor %} {% endfor %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -64,7 +64,8 @@ def css_categories():
for c in cats: for c in cats:
result += "a ." + c.css_class() + " {" result += "a ." + c.css_class() + ","
result += "span ." + c.css_class() + " {"
result += background_color_adjust_color(adjust_lightness_saturation(c.color, .2, 0.8), 0.8) result += background_color_adjust_color(adjust_lightness_saturation(c.color, .2, 0.8), 0.8)
result += "}" result += "}"
@ -76,7 +77,7 @@ def css_categories():
result += background_color_adjust_color(c.color) result += background_color_adjust_color(c.color)
result += "}" result += "}"
result += ".selected:hover ." + c.css_class() + " {" result += "a.selected:hover ." + c.css_class() + " {"
result += background_color_adjust_color(adjust_lightness_saturation(c.color, 0.2, 1.2)) result += background_color_adjust_color(adjust_lightness_saturation(c.color, 0.2, 1.2))
result += "}" result += "}"
@ -88,6 +89,6 @@ def small_cat(category, url=None, contrast=True):
class_contrast = " contrast" if contrast else "" class_contrast = " contrast" if contrast else ""
if url is None: if url is None:
return mark_safe('<span class="small-cat' + class_contrast +'" role="button"><span class="cat ' + category.css_class() + '"></span> ' + category.name + "</span>") return mark_safe('<span class="small-cat' + class_contrast +' selected" role="button"><span class="cat ' + category.css_class() + '"></span> ' + category.name + "</span>")
else: else:
return mark_safe('<a class="small-cat' + class_contrast +'" role="button" href="' + url + '"><span class="cat ' + category.css_class() + '"></span> ' + category.name + "</a>") return mark_safe('<a class="small-cat' + class_contrast +' selected" role="button" href="' + url + '"><span class="cat ' + category.css_class() + '"></span> ' + category.name + "</a>")