Sidebar fix

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index 378215898c7bda4181b2b4a5cffbbae8e0c685ef..38576edb2e2f481721c775b205d278d15c686fd7 100755 (executable)
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -1835,6 +1835,11 @@ th {
   font: 400 0.85rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
+/* line 36, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+.cta__panel {
+  margin-top: 2rem;
+}
+
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_menu-toggle.scss */
 .menu__toggle {
   display: block;

diff --git a/app/festival/static/scss/components/_sidebar.scss b/app/festival/static/scss/components/_sidebar.scss
index abad132338b1e9b291ad5eaece55f1f86b1e31e8..969f605bddeca59b69e7e77aae0b4896edd94bcb 100755 (executable)
--- a/app/festival/static/scss/components/_sidebar.scss
+++ b/app/festival/static/scss/components/_sidebar.scss
@@ -31,4 +31,8 @@
     line-height: 1.6;
     color: $gray_darker;
     font: $regular .85rem $base_font_family;
+}
+
+.cta__panel {
+  margin-top: 2rem;
 }
\ No newline at end of file

diff --git a/app/templates/base.html b/app/templates/base.html
index 07444c1b836e90b30e6b64b97e55054febf58f86..e5ff9df8e7e77da6218d5b66c7d3b83485d6adac 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -162,29 +162,24 @@
                     {% search_form "all" %}
                 </div>
 
-                <div>
-                    <a href="/media/uploads/doc/MANIFESTE-2016-AGENDA.pdf" class="btn btn-full btn-inverse">Télécharger le programme</a>
-                </div>
-                <div>
-                    <a href="/newsletter/" class="btn btn-full btn-inverse">Inscription newsletter</a>
+                {% include "includes/calendar.html" %}
+                {% include "includes/twitter.html" %}
+                {% include "includes/instafeed.html" %}
+
+                <div class="cta__panel">
+                    <div>
+                        <a href="/media/uploads/doc/MANIFESTE-2016-AGENDA.pdf" class="btn btn-full btn-inverse">Télécharger le programme</a>
+                    </div>
+                    <div>
+                        <a href="/newsletter/" class="btn btn-full btn-inverse">Inscription newsletter</a>
+                    </div>
                 </div>
 
                 {% nevercache %}
                 {% include "includes/language_selector.html" %}
-                {% include "includes/user_panel.html" %}
+                {# {% include "includes/user_panel.html" %} #}
                 {% endnevercache %}
-                <div class="panel panel-default">
-                    <div class="panel-body">
-                    {% block right_panel %}
-                    {% ifinstalled mezzanine.twitter %}
-                    {% include "twitter/tweets.html" %}
-                    {% endifinstalled %}
-                    {% endblock %}
-                    </div>
-                </div>
-                {% include "includes/calendar.html" %}
-                {% include "includes/instafeed.html" %}
-                {% include "includes/twitter.html" %}
+
             </aside>
         </div>
     </div>