Sidebar styles, program list update

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index b4862bd7f935b885fa986ec545c8e697d1f3e93d..abf6b4abe4d1df91abfba3bc66118f6e3edfd218 100755 (executable)
--- 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 9d958c0e73981a20350c225928a30c66bbf9f6f2..a4b8d67015b9da1e8d8ea177e0b6d7d46284c282 100755 (executable)
--- 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 633c385c0a886e07d26d0fe48d267d8a79dfde75..80e0e56dc9f31f71586b3ff55e69ee2ee3aaf521 100755 (executable)
--- 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 c0235ac4be62682c73f41ef0a77f90f7cde420f5..3b0acff5c0868ad8267404f7b582ebe6356c9fa4 100755 (executable)
--- 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 (executable)
index 0000000..cf99c11
--- /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 c953580b2983f6fe2adebc316f13860e449a7963..3609cf69de1f24df584fac37cdb95014a02e485b 100644 (file)
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -54,15 +54,6 @@
 </p>
 {% endblock %}
 
-{% block event_detail_calendar %}
-<p><a href='{{ event|google_calendar_url }}' target="_blank" class="">
-    Add to Google Calendar
-</a>
-<a href='{% icalendar_url %}' class="">
-    Add to Outlook/iCal
-</a></p>
-{% endblock %}
-
 {% block event_detail_featured_image %}
 {% if settings.EVENT_USE_FEATURED_IMAGE and event.featured_image %}
 <p>
@@ -81,10 +72,18 @@
 {% endeditable %}
 {% endblock %}
 
+{% block event_detail_sharebuttons %}
+{% set_short_url_for event %}
+<div class="share__button">
+    <a class="btn btn-facebook" target="_blank" href="http://facebook.com/sharer.php?u={{ request.build_absolute_uri }}&amp;t={{ event.title|urlencode }}">{% trans "Share on Facebook" %}</a>
+    <a class="btn btn-twitter" target="_blank" href="http://twitter.com/home?status={{ event.short_url|urlencode }}%20{{ event.title|urlencode }}">{% trans "Share on Twitter" %}</a>
+</div>
+{% endblock %}
+
 {% if event.location %}
 {% block event_detail_location %}
 {% editable event.location %}
-<div class="event__card--alt">
+<div class="event__card">
     <p>
         {{ event.location.address|linebreaksbr }}<br />
         <a href="{{ event|google_nav_url }}" target="_blank" class="">
@@ -123,30 +122,34 @@
 {% endblock %}
 {% endcomment %}
 
-{% block event_detail_sharebuttons %}
-{% set_short_url_for event %}
-<div class="share__button">
-    <a class="btn btn-twitter" target="_blank" href="http://twitter.com/home?status={{ event.short_url|urlencode }}%20{{ event.title|urlencode }}">{% trans "Share on Twitter" %}</a>
-    <a class="btn btn-facebook" target="_blank" href="http://facebook.com/sharer.php?u={{ request.build_absolute_uri }}&amp;t={{ event.title|urlencode }}">{% trans "Share on Facebook" %}</a>
-</div>
+{% block event_detail_calendar %}
+<p>
+    <a href='{{ event|google_calendar_url }}' target="_blank" class="btn btn-small">
+        Add to Google Calendar
+    </a>
+    <a href='{% icalendar_url %}' class="btn btn-small">
+        Add to Outlook/iCal
+    </a>
+</p>
 {% endblock %}
 
 {% block event_previous_next %}
-<ul class="pager">
-{% with event.get_previous_by_publish_date as previous %}
-{% if previous %}
-<li class="previous">
-    <a href="{{ previous.get_absolute_url }}">&larr; {{ previous }}</a>
-</li>
-{% endif %}
-{% endwith %}
-{% with event.get_next_by_publish_date as next %}
-{% if next %}
-<li class="next">
-    <a href="{{ next.get_absolute_url }}">{{ next }} &rarr;</a>
-</li>
-{% endif %}
-{% endwith %}
+<ul class="split-container pager">
+    {% with event.get_previous_by_publish_date as previous %}
+        {% if previous %}
+            <li class="split-left">
+                <a href="{{ previous.get_absolute_url }}" class="pager__item--before">&larr; {{ previous }}</a>
+            </li>
+        {% endif %}
+    {% endwith %}
+
+    {% with event.get_next_by_publish_date as next %}
+        {% if next %}
+            <li class="split-right">
+                <a href="{{ next.get_absolute_url }}" class="pager__item--after">{{ next }} &rarr;</a>
+            </li>
+        {% endif %}
+    {% endwith %}
 </ul>
 {% endblock %}
 

diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index 2c374685aa0a437247be761261db94422d2b8fb8..0ab0ca3c46d45a17973958de71cdee7c21983f41 100644 (file)
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -86,6 +86,15 @@
         {% endeditable %}
     {% endblock %}
 
+    {% block event_list_event_metainfo %}
+         {% include "agenda/includes/event_metainfo.html" %}
+        {% for child in event.children.all %}
+         {% with child as event %}
+          {% include "agenda/includes/event_metainfo.html" %}
+         {% endwith %}
+        {% endfor %}
+    {% endblock %}
+
     {% if settings.EVENT_USE_FEATURED_IMAGE and event.featured_image %}
         {% block event_list_event_featured_image %}
             <a href="{{ event.get_absolute_url }}">
@@ -102,15 +111,6 @@
         {% endeditable %}
     {% endblock %}
 
-    {% block event_list_event_metainfo %}
-         {% include "agenda/includes/event_metainfo.html" %}
-        {% for child in event.children.all %}
-         {% with child as event %}
-          {% include "agenda/includes/event_metainfo.html" %}
-         {% endwith %}
-        {% endfor %}
-    {% endblock %}
-
 {% block event_list_event_links %}
 <div class="event__detail">
     {% keywords_for event as tags %}