From 19dc789da3239a3ce872f3fecc75d262fc1a9f58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Tue, 18 Oct 2016 14:50:05 +0200 Subject: [PATCH] Add Tournees banner to events list sidebar --- app/static/src/sass/modules/_banner.scss | 10 +- app/templates/agenda/event_list.html | 133 +++++++++++------------ 2 files changed, 71 insertions(+), 72 deletions(-) diff --git a/app/static/src/sass/modules/_banner.scss b/app/static/src/sass/modules/_banner.scss index 39cc834a..9bdc5a75 100644 --- a/app/static/src/sass/modules/_banner.scss +++ b/app/static/src/sass/modules/_banner.scss @@ -99,20 +99,20 @@ $module: ".banner"; } - &--small { + &--sidebar { - height: 150px; margin-top: 0; + @include margin-bottom(2); - @include mq($until: lg) { + #{$module}__title { - height: 150px; + @include line-height(2); } #{$module}__content { - padding-top: 40px; + @include padding(1); } diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html index a8162bca..1142f0ec 100644 --- a/app/templates/agenda/event_list.html +++ b/app/templates/agenda/event_list.html @@ -87,95 +87,94 @@
-
+ {% if tag and tag|tag_is_excluded %} +
  • + + {% trans "Rendez-vous" %} + +
    • + {% else %} +
  • + + {% trans "Tournées" %} + +
    • + {% endif %} -
    +
  • -
    -
    +
    • {% if tag and not tag|tag_is_excluded or not tag %} -
    -
    - +
    +
    - -
    - - {% endif %} +
    +
    +
    {% for event in events.object_list %} {% include 'agenda/includes/event_linecard.html' %} {% endfor %} +
    -- 2.39.5