From 31a64f498c4af156e03670edd370d2298cb23270 Mon Sep 17 00:00:00 2001 From: Philippe Barbosa Date: Fri, 18 Mar 2016 15:39:58 +0100 Subject: [PATCH] Sidebar styles, program list update --- app/festival/static/css/index.css | 39 +++++++++-- app/festival/static/scss/base/_buttons.scss | 10 ++- .../static/scss/components/_sidebar.scss | 10 +-- app/festival/static/scss/index.scss | 2 + app/festival/static/scss/modules/pager.scss | 14 ++++ app/templates/agenda/event_detail.html | 65 ++++++++++--------- app/templates/agenda/event_list.html | 18 ++--- 7 files changed, 106 insertions(+), 52 deletions(-) create mode 100755 app/festival/static/scss/modules/pager.scss diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index b4862bd7..abf6b4ab 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -1354,25 +1354,34 @@ button.lang.is-active { } /* line 134, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +.share__button { + display: block; + text-align: center; + margin: 2rem auto; +} + +/* line 140, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-twitter { background: #55acee; color: white; border-color: #2795e9; + margin: 0 1rem; } -/* line 138, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 145, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-twitter:hover { background-color: #2795e9; } -/* line 143, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 150, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-facebook { background: #3b5998; color: white; border-color: #2d4373; + margin: 0 1rem; } -/* line 147, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 155, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-facebook:hover { background-color: #2d4373; } @@ -1701,18 +1710,21 @@ th { display: inline-block; *display: inline; *zoom: 1; + color: white; font: 700 1rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 1.3rem 0 0.5rem; padding: .2rem 0; - border-top: 1px solid #000; - border-bottom: 1px solid #000; + border-top: 1px solid #fff; + 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__entry { font-size: 1rem; margin: 0; - line-height: 1.4; + line-height: 1.6; + color: #555; + font: 400 0.85rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; } /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_menu-toggle.scss */ @@ -2877,6 +2889,19 @@ th { color: #555; } +/* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/pager.scss */ +.pager { + display: block; + margin: 3rem auto; +} + +/* line 10, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/pager.scss */ +.pager__item--before, +.pager__item--after { + display: block; + text-transform: uppercase; +} + /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/hero-slider.scss */ .hero__slider__item { display: block; diff --git a/app/festival/static/scss/base/_buttons.scss b/app/festival/static/scss/base/_buttons.scss index 9d958c0e..a4b8d670 100755 --- a/app/festival/static/scss/base/_buttons.scss +++ b/app/festival/static/scss/base/_buttons.scss @@ -131,10 +131,17 @@ } // Social buttons +.share__button { + display: block; + text-align: center; + margin: 2rem auto; +} + .btn-twitter { background: $color-twitter; color: white; border-color: darken($color-twitter , 10); + margin: 0 1rem; &:hover { background-color: darken($color-twitter , 10); } @@ -144,7 +151,8 @@ background: $color-facebook; color: white; border-color: darken($color-facebook , 10); + margin: 0 1rem; &:hover { background-color: darken($color-facebook , 10); } -} \ No newline at end of file +} diff --git a/app/festival/static/scss/components/_sidebar.scss b/app/festival/static/scss/components/_sidebar.scss index 633c385c..80e0e56d 100755 --- a/app/festival/static/scss/components/_sidebar.scss +++ b/app/festival/static/scss/components/_sidebar.scss @@ -7,16 +7,18 @@ display: inline-block; *display: inline; *zoom: 1; + color: white; font: $bold 1rem $base_font_family; margin: 1.3rem 0 0.5rem; padding: .2rem 0; - border-top: 1px solid #000; - border-bottom: 1px solid #000; + border-top: 1px solid #fff; + border-bottom: 1px solid #fff; } .sidebar__entry { font-size: 1rem; margin: 0; - line-height: 1.4; - // color: $gray_dar; + line-height: 1.6; + color: $gray_darker; + font: $regular .85rem $base_font_family; } \ No newline at end of file diff --git a/app/festival/static/scss/index.scss b/app/festival/static/scss/index.scss index c0235ac4..3b0acff5 100755 --- a/app/festival/static/scss/index.scss +++ b/app/festival/static/scss/index.scss @@ -77,6 +77,8 @@ 'modules/event-card', + 'modules/pager', + 'modules/hero-slider', 'modules/user'; \ No newline at end of file diff --git a/app/festival/static/scss/modules/pager.scss b/app/festival/static/scss/modules/pager.scss new file mode 100755 index 00000000..cf99c11e --- /dev/null +++ b/app/festival/static/scss/modules/pager.scss @@ -0,0 +1,14 @@ +// **************************************************************** +// _Pager +// **************************************************************** + +.pager { + display: block; + margin: 3rem auto +} + +.pager__item--before, +.pager__item--after { + display: block; + text-transform: uppercase; +} \ No newline at end of file diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index c953580b..3609cf69 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -54,15 +54,6 @@

{% endblock %} -{% block event_detail_calendar %} -

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

-{% endblock %} - {% block event_detail_featured_image %} {% if settings.EVENT_USE_FEATURED_IMAGE and event.featured_image %}

@@ -81,10 +72,18 @@ {% endeditable %} {% endblock %} +{% block event_detail_sharebuttons %} +{% set_short_url_for event %} +

+ {% trans "Share on Facebook" %} + {% trans "Share on Twitter" %} +
+{% endblock %} + {% if event.location %} {% block event_detail_location %} {% editable event.location %} -
+

{{ event.location.address|linebreaksbr }}
@@ -123,30 +122,34 @@ {% endblock %} {% endcomment %} -{% block event_detail_sharebuttons %} -{% set_short_url_for event %} -

+{% block event_detail_calendar %} +

+ + Add to Google Calendar + + + Add to Outlook/iCal + +

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