From ba0509fac144c8e2ea40a052b3d76c33e50b0672 Mon Sep 17 00:00:00 2001 From: Philippe Barbosa Date: Wed, 6 Apr 2016 14:26:25 +0200 Subject: [PATCH] Various improvments --- app/festival/static/css/index.css | 44 ++++++++++++++----- app/festival/static/scss/index.scss | 1 + .../static/scss/modules/event-card.scss | 12 ++++- app/festival/static/scss/modules/icons.scss | 4 +- app/templates/agenda/event_detail.html | 43 +++++++++--------- app/templates/agenda/event_location_list.html | 28 ++++++------ .../agenda/includes/event_metainfo.html | 11 ++--- 7 files changed, 88 insertions(+), 55 deletions(-) diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index 27787c3c..074be51e 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -3093,7 +3093,6 @@ th { font-weight: 700; text-transform: uppercase; color: #000; - margin-bottom: 1rem; font-size: 0.7rem; } @@ -3106,6 +3105,17 @@ th { } /* line 77, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__meta + .event__meta, .event__meta--alt + .event__meta, .event__meta + .event__meta--alt, .event__meta--alt + .event__meta--alt { + padding-top: 0; + margin-top: -.3rem; +} + +/* line 80, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__meta + .event__meta .event__meta__inner, .event__meta--alt + .event__meta .event__meta__inner, .event__meta + .event__meta--alt .event__meta__inner, .event__meta--alt + .event__meta--alt .event__meta__inner { + border-top: none; +} + +/* line 85, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta--alt { padding: 0; margin: 0; @@ -3113,18 +3123,18 @@ th { font-size: 1rem; } -/* line 84, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 92, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta--alt .event__meta__inner { border-top: none; border-bottom: none; } -/* line 89, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 97, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta--alt .event__meta__location { color: white; } -/* line 94, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 102, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta__location { display: block; text-decoration: none; @@ -3132,7 +3142,7 @@ th { font-weight: 400; } -/* line 104, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 112, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta__cta { text-transform: uppercase; display: block; @@ -3140,15 +3150,14 @@ th { background: #fff; } -/* line 112, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 120, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta__btn { - width: 50%; display: block; text-align: center; margin: 1rem auto; } -/* line 119, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 127, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__detail, .event__detail a { text-align: right; @@ -3213,6 +3222,11 @@ th { content: ""; } +/* line 154, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/icons.scss */ +.icon__calendar:before { + content: ""; +} + /* line 179, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/icons.scss */ .icon__sign-out:before { content: ""; @@ -3234,6 +3248,11 @@ th { content: ""; } +/* line 425, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/icons.scss */ +.icon__windows:before { + content: ""; +} + /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/bk-news.scss */ .bk__news { display: block; @@ -3323,13 +3342,13 @@ th { } /* line 12, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/share-links.scss */ -.share__link__item { +.share__link__item, .push__calendar__item { text-transform: uppercase; margin-right: 1rem; } /* line 15, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/share-links.scss */ -.share__link__item .icon { +.share__link__item .icon, .push__calendar__item .icon { color: #9f7f3c; font-size: 1.1rem; margin-right: .4rem; @@ -3359,6 +3378,11 @@ th { background-color: #2d4373; } +/* line 1, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/push-calendar.scss */ +.push__calendar { + margin-top: -2rem; +} + /* line 1, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/calendar.scss */ .calendar__month { width: 100%; diff --git a/app/festival/static/scss/index.scss b/app/festival/static/scss/index.scss index d630d2f2..b5642dc8 100755 --- a/app/festival/static/scss/index.scss +++ b/app/festival/static/scss/index.scss @@ -80,5 +80,6 @@ 'modules/bk-news', 'modules/hero-slider', 'modules/share-links', + 'modules/push-calendar', 'modules/calendar', 'modules/user'; \ No newline at end of file diff --git a/app/festival/static/scss/modules/event-card.scss b/app/festival/static/scss/modules/event-card.scss index 0bca48ef..2d04ccae 100644 --- a/app/festival/static/scss/modules/event-card.scss +++ b/app/festival/static/scss/modules/event-card.scss @@ -62,7 +62,7 @@ font-weight: $bold; text-transform: uppercase; color: $black; - margin-bottom: 1rem; + // margin-bottom: 1rem; font-size: 0.7rem; &__inner { @@ -74,6 +74,14 @@ } } +.event__meta + .event__meta { + padding-top: 0; + margin-top: -.3rem; + .event__meta__inner { + border-top: none; + } +} + .event__meta--alt { @extend .event__meta; padding: 0; @@ -110,7 +118,7 @@ } .event__meta__btn { - width: 50%; + // width: 50%; display: block; text-align: center; margin: 1rem auto; diff --git a/app/festival/static/scss/modules/icons.scss b/app/festival/static/scss/modules/icons.scss index 6b06f651..57eff328 100755 --- a/app/festival/static/scss/modules/icons.scss +++ b/app/festival/static/scss/modules/icons.scss @@ -151,7 +151,7 @@ // .icon__warning:before, // .icon__exclamation-triangle:before { content: $fa-var-exclamation-triangle; } // .icon__plane:before { content: $fa-var-plane; } -// .icon__calendar:before { content: $fa-var-calendar; } +.icon__calendar:before { content: $fa-var-calendar; } // .icon__random:before { content: $fa-var-random; } // .icon__comment:before { content: $fa-var-comment; } // .icon__magnet:before { content: $fa-var-magnet; } @@ -422,7 +422,7 @@ // .icon__long-arrow-left:before { content: $fa-var-long-arrow-left; } // .icon__long-arrow-right:before { content: $fa-var-long-arrow-right; } // .icon__apple:before { content: $fa-var-apple; } -// .icon__windows:before { content: $fa-var-windows; } +.icon__windows:before { content: $fa-var-windows; } // .icon__android:before { content: $fa-var-android; } // .icon__linux:before { content: $fa-var-linux; } // .icon__dribbble:before { content: $fa-var-dribbble; } diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index d4f56a71..4745146d 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -76,22 +76,32 @@ {% include "includes/share_buttons.html" %} {% endwith %} {% endblock %} +{% block event_detail_calendar %} +
+ + + Add to Google Calendar + + + + Add to Outlook/iCal + +
+{% endblock %} {% if event.location %}

Le lieu :

{% block event_detail_location %} {% editable event.location %} -
-

- {{ event.location.address|linebreaksbr }}
- - Get Directions - -

- - {% google_static_map event 900 300 15 %} - -
+

+

{{ event.location }} {{ event.location.address|linebreaksbr }}

+ + Get Directions + +

+ + {% google_static_map event 900 300 15 %} + {% endeditable %} {% endblock %} {% endif %} @@ -120,17 +130,6 @@ {% endblock %} {% endcomment %} -{% block event_detail_calendar %} -

- - Add to Google Calendar - - - Add to Outlook/iCal - -

-{% endblock %} - {% block event_previous_next %}