From: Emilie <zawadzki@ircam.fr>
Date: Tue, 7 Feb 2017 17:21:05 +0000 (+0100)
Subject: resolve conficts
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6cef4a014ff7643c1b17c46811ab0c092b4e4174;p=mezzo.git

resolve conficts
---

6cef4a014ff7643c1b17c46811ab0c092b4e4174
diff --cc app/templates/base.html
index f08c4680,0afc3dbf..ba311048
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@@ -67,7 -67,29 +67,29 @@@
              {% block content_footer %}{% endblock %}
          </main>
  
-         {% include "twitter/tweets.html" %}
+         <div class="section container">
+             <div class="row">
+ 
+                 <div class="col-sm-8 tac">
+                     <div class="section-title section-title--uppercase section-title--underline section-title--accent">
+                         {% trans "Instagram feed" %}
+                     </div>
+                     <div>
+                         INSTAGRAM HERE
+                     </div>
+                 </div>
+ 
+                 <div class="col-sm-6 col-sm-push-1 tac">
+                     <div class="section-title section-title--uppercase section-title--underline section-title--main">
+                         {% trans "Twitter feed" %}
+                     </div>
+                     <div>
 -                        {% include "twitter/hashtag.html" %}
++                        {% include "twitter/tweets.html" %}
+                     </div>
+                 </div>
+ 
+             </div>
+         </div>
  
          <footer class="footer" role="footer">
              {% include "includes/footer.html" %}