From 884753c1636c47831646e73e1636a7a7975efeb8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Tue, 7 Feb 2017 18:13:02 +0100 Subject: [PATCH] Homepage Twitter and Instagram first integration --- app/static/src/sass/layout/_footer.scss | 2 +- app/static/src/sass/layout/_global.scss | 4 ++++ .../src/sass/modules/_section-title.scss | 7 ++++++ app/templates/base.html | 24 ++++++++++++++++++- app/templates/index.html | 4 +++- 5 files changed, 38 insertions(+), 3 deletions(-) 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 %} - {% include "twitter/hashtag.html" %} +
+
+ +
+
+ {% trans "Instagram feed" %} +
+
+ INSTAGRAM HERE +
+
+ +
+
+ {% trans "Twitter feed" %} +
+
+ {% include "twitter/hashtag.html" %} +
+
+ +
+