From 336aa14c35bd3f455b208e91f126241c427fc1da Mon Sep 17 00:00:00 2001 From: Philippe Barbosa Date: Wed, 6 Apr 2016 12:42:13 +0200 Subject: [PATCH] Event detail updates --- app/festival/static/css/index.css | 13 +++++++----- .../static/scss/components/_sidebar.scss | 1 + app/templates/agenda/event_detail.html | 21 ++++++++++++------- app/templates/agenda/includes/event_card.html | 2 +- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index 416e66cb..27787c3c 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -517,6 +517,7 @@ body { /* line 30, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_defaults.scss */ .clearfix:after, .container:after, .row:after, .sidebar__title--inverse:after, +.section__title--inverse:after, .page__related__title--inverse:after, .row-box:after, .event__card:after, .event__card--alt:after, .event__card--full:after, .calendar__month:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .media:after, .split-container:after, .video__list:after { content: ""; display: table; @@ -813,6 +814,7 @@ pre > p { /* line 22, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ .row, .sidebar__title--inverse, +.section__title--inverse, .page__related__title--inverse, .row-box, .event__card, .event__card--alt, .event__card--full, .calendar__month { display: block; } @@ -1771,7 +1773,9 @@ th { /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ .sidebar__title, .sidebar__title--inverse, +.section__title--inverse, .page__related__title--inverse, +.section__title, .page__related__title { text-transform: uppercase; display: inline-block; @@ -1785,8 +1789,9 @@ th { border-bottom: 1px solid #fff; } -/* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ +/* line 18, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ .sidebar__title--inverse, +.section__title--inverse, .page__related__title--inverse { color: #000; border-top-color: #000; @@ -1794,7 +1799,7 @@ th { margin-bottom: 2rem; } -/* line 28, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ +/* line 29, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ .sidebar__entry { font-size: 1rem; margin: 0; @@ -1803,7 +1808,7 @@ th { font: 400 0.85rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; } -/* line 36, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ +/* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ .cta__panel { margin-top: 2rem; } @@ -3314,8 +3319,6 @@ th { text-align: left; margin: 2rem auto; padding: .3rem 0; - border-top: 1px solid #9f7f3c; - border-bottom: 1px solid #9f7f3c; list-style: none; } diff --git a/app/festival/static/scss/components/_sidebar.scss b/app/festival/static/scss/components/_sidebar.scss index 969f605b..78571ec2 100755 --- a/app/festival/static/scss/components/_sidebar.scss +++ b/app/festival/static/scss/components/_sidebar.scss @@ -3,6 +3,7 @@ // **************************************************************** .sidebar__title, +.section__title, .page__related__title { text-transform: uppercase; display: inline-block; diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index f266570c..d4f56a71 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -78,6 +78,7 @@ {% endblock %} {% if event.location %} +

Le lieu :

{% block event_detail_location %} {% editable event.location %}
@@ -152,15 +153,19 @@ {% block event_related %} -

{% trans "Artists" %}

-{% for artist in event.artists.all %} - {% include "festival/inc/artist_card.html" %} -{% endfor %} +

{% trans "Artists" %}

+
+ {% for artist in event.artists.all %} + {% include "festival/inc/artist_card.html" %} + {% endfor %} +
-

{% trans "Videos" %}

-{% for video in event.videos.all %} - {% include 'festival/inc/video_card.html' %} -{% endfor %} +

{% trans "Videos" %}

+
+ {% for video in event.videos.all %} + {% include 'festival/inc/video_card.html' %} + {% endfor %} +
{% endblock %} diff --git a/app/templates/agenda/includes/event_card.html b/app/templates/agenda/includes/event_card.html index 0587566d..f13afb01 100644 --- a/app/templates/agenda/includes/event_card.html +++ b/app/templates/agenda/includes/event_card.html @@ -33,7 +33,7 @@
{% endcomment %} {% endblock %} - + {% block booking %} {# #} -- 2.39.5