From: Jérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Date: Tue, 7 Feb 2017 17:13:02 +0000 (+0100)
Subject: Homepage Twitter and Instagram first integration
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=884753c1636c47831646e73e1636a7a7975efeb8;p=mezzo.git

Homepage Twitter and Instagram first integration
---

diff --git a/app/static/src/sass/layout/_footer.scss b/app/static/src/sass/layout/_footer.scss
index f1c96fe9..a222db9d 100755
--- a/app/static/src/sass/layout/_footer.scss
+++ b/app/static/src/sass/layout/_footer.scss
@@ -24,7 +24,7 @@ $module: ".footer";
 
     /* Rectangle 2: */
     background-image: linear-gradient(-180deg, #000F24 0%, #FF203C 100%);
-    @include margin-top(5);
+    @include margin-top(10);
 
     @include mq($until: xs) {
         div[class^="col-"] {
diff --git a/app/static/src/sass/layout/_global.scss b/app/static/src/sass/layout/_global.scss
index 2eaa8d1b..7c0202b0 100755
--- a/app/static/src/sass/layout/_global.scss
+++ b/app/static/src/sass/layout/_global.scss
@@ -29,6 +29,10 @@
     }
 }
 
+.section {
+    @include margin-top(5);
+}
+
 #container {
     @include mq($until: sm) {
         margin-top: $header-height-tablet;
diff --git a/app/static/src/sass/modules/_section-title.scss b/app/static/src/sass/modules/_section-title.scss
index 64464d21..1dcd1c85 100644
--- a/app/static/src/sass/modules/_section-title.scss
+++ b/app/static/src/sass/modules/_section-title.scss
@@ -31,6 +31,13 @@ $module: ".section-title";
             color: $color-accent;
         }
     }
+    
+    &--main {
+        border-color: $color-main;
+        &:before {
+            color: $color-main;
+        }
+    }
 
     &:before {
         content: '_';
diff --git a/app/templates/base.html b/app/templates/base.html
index c4a40843..0afc3dbf 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -67,7 +67,29 @@
             {% block content_footer %}{% endblock %}
         </main>
 
-        {% include "twitter/hashtag.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" %}
+                    </div>
+                </div>
+
+            </div>
+        </div>
 
         <footer class="footer" role="footer">
             {% include "includes/footer.html" %}
diff --git a/app/templates/index.html b/app/templates/index.html
index 723b3c15..448dd29c 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -19,6 +19,8 @@
 
     {% include "home/inc/bio.html" %}
 
-    {% include "home/inc/body.html" %}
+    <div class="section">
+        {% include "home/inc/body.html" %}
+    </div>
 
 {% endblock %}