diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index a8aeb12..f5ab949 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -1,11 +1,13 @@ /* Custom Pink version */ // Override default variables -$primary-500: #00aaaa; +/*$primary-500: #00aaaa; $primary-600: #009696; -$primary-700: #008080; +$primary-700: #008080;*/ - +$primary-500: #008989; +$primary-600: #008080; +$primary-700: #006c6c; // Import Pico @import "./pico/pico"; @@ -114,7 +116,8 @@ svg { padding: 0.8em 0; margin: 0 1em 0 0; text-align: center; - width: 7em; + width: 25%; + min-width: 7em; .large { font-size: 140%; @@ -133,7 +136,8 @@ svg { .ephemeris-hour { @extend .ephemeris; padding: 1.5em 0.1em; - width: 5em; + width: 15%; + min-width: 5em; font-weight: bold; } @@ -208,8 +212,9 @@ article.day>ul { } -.day.today>header { - background: rgba(255, 0, 140, 0.15); +.day.today>header, +.day.today { + background: rgba(255, 0, 76, 0.1); } .day.past { diff --git a/src/agenda_culturel/templates/agenda_culturel/event-inc.html b/src/agenda_culturel/templates/agenda_culturel/event-inc.html index 88e038a..d456bad 100644 --- a/src/agenda_culturel/templates/agenda_culturel/event-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/event-inc.html @@ -17,8 +17,10 @@ {% if display == "in list" %} {% include "agenda_culturel/ephemeris-inc.html" with event=event %} {% endif %} + {{ event.category | small_cat }} {% if event.location %}
{% endif %} {% if display == "in list" %}

{% else %}

{% endif %} + {{ event.title }} {% if display == "in list" %}

{% else %}{% endif %} {% if event.location %} @@ -66,6 +68,7 @@ {% else %}
{% include "agenda_culturel/ephemeris-inc.html" with event=event %} + {{ event.category | small_cat }}

{{ event.title }}

@@ -114,18 +117,6 @@

-

- {% if mode %} - {% if category %} - {{ event.category | small_cat }} - {% else %} - {% url 'view_mode_cat' selected_mode.name event.category.pk as url_cat %} - {{ event.category | small_cat:url_cat }} - {% endif %} - {% else %} - {{ event.category | small_cat }} - {% endif %} -

{% for tag in event.tags %} {{ tag }} diff --git a/src/agenda_culturel/templates/agenda_culturel/page-day.html b/src/agenda_culturel/templates/agenda_culturel/page-day.html index 5acc6f5..10e712e 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-day.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-day.html @@ -53,7 +53,7 @@ {% endfor %} {% else %}

- Il n'y a pas d'événement prévu à cette date. + Il n'y a pas d'événement prévu à cette date.
{% endif %}