sidebar styles

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index 2fef7c328def1949adf5631f7eaf75fc5bbf1506..adde83ab08e70bdbb9c06daf07e0a69de23bbfb6 100755 (executable)
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -1229,7 +1229,7 @@ button:disabled {
   padding-left: 1rem;
   background: #d7a433;
   color: #000;
-  font-family: "Triplex", Georgia, Times, "Times New Roman", serif;
+  font-family: "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
   border-radius: 0px;
   text-transform: uppercase;
 }
@@ -1334,7 +1334,7 @@ button:disabled {
 .btn-inverse,
 .btn-inverse:hover {
   background: #f7f7f7;
-  color: #e8ca88;
+  color: #000;
   border: 1px solid #f7f7f7;
 }
 
@@ -1756,7 +1756,7 @@ th {
 }
 
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
-.sidebar__title {
+.sidebar__title, .sidebar__title--inverse {
   text-transform: uppercase;
   display: inline-block;
   *display: inline;
@@ -1769,7 +1769,12 @@ th {
   border-bottom: 1px solid #fff;
 }
 
-/* line 18, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+/* line 16, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+.sidebar__title--inverse {
+  color: #000;
+}
+
+/* line 22, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
 .sidebar__entry {
   font-size: 1rem;
   margin: 0;
@@ -3126,12 +3131,12 @@ th {
   }/* line 27, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
   .main {
     float: left;
-    width: 70%;
+    width: 75%;
     padding-right: 1rem;
   }/* line 38, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
   .aside {
     float: left;
-    width: 30%;
+    width: 25%;
   }/* line 54, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
   .site__content__header__inner {
     max-width: 70%;

diff --git a/app/festival/static/scss/base/_buttons.scss b/app/festival/static/scss/base/_buttons.scss
index a4b8d67015b9da1e8d8ea177e0b6d7d46284c282..1cecf05330b2bd04984bc5bd7b74f189b4c7a348 100755 (executable)
--- a/app/festival/static/scss/base/_buttons.scss
+++ b/app/festival/static/scss/base/_buttons.scss
@@ -22,7 +22,7 @@
     padding-left: 1rem;
     background: $base_btn_background_color;
     color: $base_btn_color;
-    font-family: $header_font_family;
+    font-family: $base_font_family;
 
     @if $base_border_radius {
       border-radius:$base_border_radius;
@@ -118,7 +118,7 @@
 .btn-inverse,
 .btn-inverse:hover {
     background: $base_background_color;
-    color: $main_color;
+    color: $black;
     border: 1px solid $base_background_color;
 }
 

diff --git a/app/festival/static/scss/base/_layout.scss b/app/festival/static/scss/base/_layout.scss
index 8aaa175bbd6b409faf0be0dd985a84de1be79d84..22c5b28d8f0c62e3594674dd9bd470f4216bc622 100755 (executable)
--- a/app/festival/static/scss/base/_layout.scss
+++ b/app/festival/static/scss/base/_layout.scss
@@ -30,7 +30,7 @@
   // padding-top: 3rem;
   @media (min-width : $desktop ) {
     float: left;
-    width: 70%;
+    width: 75%;
     padding-right: 1rem;
   }
 }
@@ -43,7 +43,7 @@
   color: white;
   @media (min-width : $desktop ) {
     float: left;
-    width: 30%;
+    width: 25%;
   }
 }
 

diff --git a/app/festival/static/scss/components/_sidebar.scss b/app/festival/static/scss/components/_sidebar.scss
index 80e0e56dc9f31f71586b3ff55e69ee2ee3aaf521..025561955d99758f74f454c498687fbb47605872 100755 (executable)
--- a/app/festival/static/scss/components/_sidebar.scss
+++ b/app/festival/static/scss/components/_sidebar.scss
@@ -13,6 +13,10 @@
   padding: .2rem 0;
   border-top: 1px solid #fff;
   border-bottom: 1px solid #fff;
+  &--inverse {
+    color: $black;
+    @extend .sidebar__title;
+  }
 }
 
 .sidebar__entry {

diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index 1cfa6e8c8305c3682a713f493909543a436164da..0da98be3ce2e87bccf387da635f6924dd0022adf 100644 (file)
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -98,7 +98,7 @@
     {% block event_list_event_content %}
         {% editable event.content %}
             <div class="event__description">
-                {{ event.description|safe }}
+                {{ event.description_from_content|safe }}
                 <a href="{{ event.get_absolute_url }}" class="event__meta__cta">{% trans "read more" %}</a>
             </div>
         {% endeditable %}

diff --git a/app/templates/base.html b/app/templates/base.html
index e00a33a997a9b22c5b5d738396aef5a8128971a9..3bc3584c6f743941d51f2147fb0d6b294a49d57d 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -141,6 +141,16 @@
                 <div class="search__form">
                     {% search_form "all" %}
                 </div>
+
+                <h2 class="sidebar__title">Télécharger :</h2>
+
+                <div>
+                    <a href="#" class="btn btn-full btn-inverse">Le programme</a>
+                </div>
+                <div>
+                    <a href="#" class="btn btn-full btn-inverse">La brochure</a>
+                </div>
+
                 {% nevercache %}
                 {% include "includes/language_selector.html" %}
                 {% include "includes/user_panel.html" %}