Homepage and location updates

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index f9f81277b881561a57265774bd9306b57e0c6b9e..0787ca43008a4a8f181b07fb0952ea1a7b9acb49 100755 (executable)
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -518,7 +518,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, .last__media:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .cta__panel:after, .media:after, .split-container:after, .video__list:after {
+.page__related__title--inverse:after, .row-box:after, .event__card:after, .event__card--alt:after, .event__card--full:after, .calendar__month:after, .last__media:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .cta__panel:after, .media:after, .split-container:after, .video__list:after, .c-tabs:after {
   content: "";
   display: table;
   clear: both;
@@ -805,6 +805,14 @@ pre > p {
   font-weight: 700;
 }
 
+/* line 237, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
+.location__title {
+  text-transform: uppercase;
+  margin: 0;
+  padding: 0;
+  font: 700 1em/1.2 "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
 .container {
   margin: 0 auto;
@@ -3493,32 +3501,34 @@ th {
 /**
  * Tabs navigation
  */
-/* line 4, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 8, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs-nav {
   display: block;
   float: left;
   text-align: left;
-  width: 30%;
+  width: 40%;
 }
 
-/* line 11, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 18, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs-nav__link {
   color: #d2ba88;
   display: block;
   transition: color 0.3s;
+  font-size: .6em;
+  padding: 0.25rem;
 }
 
-/* line 22, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 32, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs-nav__link:last-child {
   margin-right: 0;
 }
 
-/* line 30, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 40, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs-nav__link.is-active {
   color: #b18d43;
 }
 
-/* line 35, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 45, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs-nav__link i,
 .c-tabs-nav__link span {
   margin: 0;
@@ -3526,12 +3536,12 @@ th {
   line-height: 1;
 }
 
-/* line 42, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 52, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs-nav__link i {
   font-size: 18px;
 }
 
-/* line 46, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 56, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs-nav__link span {
   display: none;
   font-size: 18px;
@@ -3540,19 +3550,19 @@ th {
 /**
  * Tab
  */
-/* line 64, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 74, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tab {
   display: none;
   float: left;
-  width: 70%;
+  width: 60%;
 }
 
-/* line 71, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 84, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tab.is-active {
   display: block;
 }
 
-/* line 75, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 88, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tab__content {
   padding-left: .5rem;
 }
@@ -3560,18 +3570,18 @@ th {
 /**
  * Tabs no-js fallback
  */
-/* line 82, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 95, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs.no-js .c-tabs-nav {
   display: none;
 }
 
-/* line 86, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 99, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs.no-js .c-tab {
   display: block;
   margin-bottom: 1.5rem;
 }
 
-/* line 91, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+/* line 104, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
 .c-tabs.no-js .c-tab:last-child {
   margin-bottom: 0;
 }
@@ -3585,12 +3595,12 @@ th {
   text-transform: uppercase;
 }
 @media all and (min-width: 720px){
-  /* line 52, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+  /* line 62, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
   .c-tabs-nav__link i{
     margin-bottom: 12px;
     font-size: 22px;
   }
-  /* line 56, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+  /* line 66, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
   .c-tabs-nav__link span{
     display: block;
   }
@@ -3864,6 +3874,20 @@ th {
   .hero__slider__item{
     height: 500px;
   }
+  /* line 8, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+  .c-tabs-nav{
+    width: 30%;
+  }
+  /* line 18, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+  .c-tabs-nav__link{
+    padding: 0;
+    font-size: .75rem;
+    line-height: 1.6;
+  }
+  /* line 74, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/tabs.scss */
+  .c-tab{
+    width: 70%;
+  }
 }
 @media (min-width: 1200px){
   /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */

diff --git a/app/festival/static/scss/base/_layout.scss b/app/festival/static/scss/base/_layout.scss
index 6463647ff7c64d34ba265a95018d3c7b06131e75..9418675831a09122403dc266a1b143f5e71ef4e1 100755 (executable)
--- a/app/festival/static/scss/base/_layout.scss
+++ b/app/festival/static/scss/base/_layout.scss
@@ -65,4 +65,26 @@
   @media (min-width : $desktop ) {
       max-width: 70%;
   }
-}
\ No newline at end of file
+}
+
+.last__media {
+  @extend .clearfix;
+  &__entry {
+    display: block;
+    @media (min-width : $tablet ) {
+        float: left;
+        width: 33.33333%;
+        padding: 1rem .25rem;
+    }
+  }
+
+  .artist__item,
+  .video__card {
+    float: none;
+    width: 100%;
+    padding: 0;
+    // margin-bottom: 1rem;
+    // margin-left: -.5rem;
+    // margin-right: -.5rem;
+  }
+}

diff --git a/app/festival/static/scss/base/_typography.scss b/app/festival/static/scss/base/_typography.scss
index 39e1171db377e054d5df8b50820f843df7056bc6..188c525d98eff4c956763b1f4dc67d24fe3e2792 100755 (executable)
--- a/app/festival/static/scss/base/_typography.scss
+++ b/app/festival/static/scss/base/_typography.scss
@@ -232,4 +232,11 @@ pre > p {
 
 .bodytext a {
   font-weight: $bold;
+}
+
+.location__title {
+  text-transform: uppercase;
+  margin: 0;
+  padding: 0;
+  font: $bold 1em/1.2 $base_font_family;
 }
\ No newline at end of file

diff --git a/app/festival/static/scss/modules/artist-card.scss b/app/festival/static/scss/modules/artist-card.scss
index 24eef3800af239dd16902083379bfbb045982430..eee7079b5c445a81f02fb61643cbddd6c3d8d108 100644 (file)
--- a/app/festival/static/scss/modules/artist-card.scss
+++ b/app/festival/static/scss/modules/artist-card.scss
@@ -18,6 +18,7 @@
 .artist__item {
   float: left;
   padding: 0.5rem;
+  padding-left: 0;
 
   @media (min-width : $desktop ) {
      padding: 0 0.5rem 1rem;

diff --git a/app/festival/static/scss/modules/tabs.scss b/app/festival/static/scss/modules/tabs.scss
index 3d5fe7582935505c8839147cb1f087a713b9ed6e..7f1e8c0f1054759b1cc42643d06f4d0adde11ea5 100755 (executable)
--- a/app/festival/static/scss/modules/tabs.scss
+++ b/app/festival/static/scss/modules/tabs.scss
@@ -1,22 +1,32 @@
 /**
  * Tabs navigation
  */
+
+.c-tabs {
+  @extend .clearfix;
+}
 .c-tabs-nav {
   display: block;
   float: left;
   text-align: left;
-  width: 30%;
+  width: 40%;
+  @media (min-width : $desktop ) {
+    width: 30%;
+  }
 }
 
 .c-tabs-nav__link {
-  // margin-right: 4px;
-  // padding: 12px;
   color: $main_color;
   display: block;
-  // background-color: #b3b3b3;
-  // text-align: center;
-  -webkit-transition: color 0.3s;
-          transition: color 0.3s;
+  transition: color 0.3s;
+  font-size: .6em;
+  padding: 0.25rem;
+  @media (min-width : $desktop ) {
+    padding: 0;
+    font-size: .75rem;
+    line-height: $base_line_height;
+
+  }
 }
 
 .c-tabs-nav__link:last-child {
@@ -65,7 +75,10 @@
   display: none;
   // background-color: #e7e7e7;
   float: left;
-  width: 70%;
+  width: 60%;
+  @media (min-width : $desktop ) {
+    width: 70%;
+  }
 }
 
 .c-tab.is-active {

diff --git a/app/festival/templates/festival/inc/audio_playlist.html b/app/festival/templates/festival/inc/audio_playlist.html
index 18bc921bffe0e67c515b6810705eff33551c1ec4..b70167645d1b2fa6ed6a3a23bfce0460a2174923 100644 (file)
--- a/app/festival/templates/festival/inc/audio_playlist.html
+++ b/app/festival/templates/festival/inc/audio_playlist.html
@@ -2,22 +2,13 @@
 
 {% for audio in playlist.audios.all %}
 {% if forloop.first %}
+<p>{{ audio.title }}</p>
 <audio id="audio" preload="auto" tabindex="0" controls="" >
     <source id="primarysrc" src="{{ audio.closed_source_url }}">
     <source id="secondarysrc" src="{{ audio.open_source_url }}">
     {{ audio.title }}
 </audio>
-<ul id="playlist">
 {% endif %}
-    <li class="active">
-        <a href="{{ audio.closed_source_url }}" data-altsrc="{{ audio.open_source_url }}">
-            {{ audio.title }}
-        </a>
-    </li>
 {% endfor %}
 {% if forloop.first %}
-</ul>
 {% endif %}
-
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
-<script src="{% static "js/player.js" %}"></script>

diff --git a/app/templates/agenda/event_location_list.html b/app/templates/agenda/event_location_list.html
index 499810aa5e9d7740394580da4566bb9fec455b3f..3462cc8271701c9e02b53a2c827d851badb9d589 100644 (file)
--- a/app/templates/agenda/event_location_list.html
+++ b/app/templates/agenda/event_location_list.html
@@ -37,14 +37,12 @@
   {% for location in object_list %}
       <div class="c-tab {% if forloop.first %}is-active{% endif %}">
           <div class="c-tab__content">
-              <h3 style="margin-top: 0;">{{ location.title }}</h3>
+              <h3 class="location__title">{{ location.title }}</h3>
                   {% block event_detail_location %}
                   {% editable event.location %}
                   <p>
                       {{ location.address }}<br />
-                      <a href="{{ location|google_nav_url }}" target="_blank" class="">
-                          Get Directions
-                      </a>
+                      <a href="{{ location|google_nav_url }}" target="_blank" class=""> Get Directions </a>
                   </p>
                   <a href="{{ location|google_nav_url }}" target="_blank" class="">
                   {% google_static_map location 900 300 15 %}