From f9f53c800250669e48d1bcb07ddbcc823c4dfd40 Mon Sep 17 00:00:00 2001 From: Philippe Barbosa Date: Mon, 4 Apr 2016 22:31:24 +0200 Subject: [PATCH] Spacing layout fix --- app/festival/static/css/index.css | 31 +++++++---- app/festival/static/scss/base/_layout.scss | 8 ++- .../static/scss/components/_headers.scss | 3 +- app/templates/base.html | 51 +++++++++---------- 4 files changed, 54 insertions(+), 39 deletions(-) diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index 4d113b21..b7d9d10e 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -833,12 +833,12 @@ pre > p { border-bottom: 1px solid #fff; } -/* line 53, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ +/* line 56, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ .site__content__header { - padding-top: 3rem; + padding-top: 3em; } -/* line 57, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ +/* line 63, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ .site__content__header__inner { padding-right: 1rem; } @@ -1623,7 +1623,7 @@ th { .nav__complementary { display: block; list-style: none; - text-align: right; + text-align: left; position: absolute; z-index: 200; top: 100%; @@ -1642,35 +1642,36 @@ th { margin: 0 .1rem; text-align: center; border-radius: 0 0 3px 3px; + box-shadow: 0 2px 4px -2px black; } -/* line 206, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ +/* line 207, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ .nav__complementary__item a, .nav__complementary__item--facebook a, .nav__complementary__item--twitter a, .nav__complementary__item__lang a { color: white; } -/* line 210, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ +/* line 211, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ .nav__complementary__item--facebook { background: #3b5998; } -/* line 215, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ +/* line 216, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ .nav__complementary__item--twitter { background: #55acee; margin-right: 1rem; } -/* line 221, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ +/* line 222, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ .nav__complementary__item__lang { opacity: .6; } -/* line 224, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ +/* line 225, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ .nav__complementary__item__lang a { color: #bdc3c7; } -/* line 228, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ +/* line 229, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ .nav__complementary__item__lang.is-active { opacity: 1; } @@ -3494,7 +3495,15 @@ th { margin: 0 0 3rem; border-bottom: none; } - /* line 57, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ + /* line 50, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ + .aside.aside-home{ + margin-top: -2rem; + } + /* line 56, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ + .site__content__header{ + padding-top: 5rem; + } + /* line 63, /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/_layout.scss b/app/festival/static/scss/base/_layout.scss index 28254088..6463647f 100755 --- a/app/festival/static/scss/base/_layout.scss +++ b/app/festival/static/scss/base/_layout.scss @@ -47,11 +47,17 @@ width: 25%; margin: 0 0 3rem; border-bottom: none; + &.aside-home { + margin-top: -2rem; + } } } .site__content__header { - padding-top: 3rem; + padding-top: 3em; + @media (min-width : $desktop ) { + padding-top: 5rem; + } } .site__content__header__inner { diff --git a/app/festival/static/scss/components/_headers.scss b/app/festival/static/scss/components/_headers.scss index 5d499fd6..43543bfe 100755 --- a/app/festival/static/scss/components/_headers.scss +++ b/app/festival/static/scss/components/_headers.scss @@ -184,7 +184,7 @@ .nav__complementary { display: block; list-style: none; - text-align: right; + text-align: left; position: absolute; z-index: $zi_2; top: 100%; @@ -202,6 +202,7 @@ margin: 0 .1rem; text-align: center; border-radius: 0 0 3px 3px; + box-shadow: 0 2px 4px -2px black; a { color: white; diff --git a/app/templates/base.html b/app/templates/base.html index e5ff9df8..dda3cc3c 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -126,38 +126,37 @@ {% endcomment %}
- {% if on_home %} -
-
-
-
- - Dernière
minute ! -
-
-
-

- Partagez, twittez, commentez, publiez vos photos…
- et réservez dès maintenant vos places ou abonnements pour bénéficier de tarifs privilégiés. -

+
+
+ {% if on_home %} +
+
+
+
+ + Dernière
minute ! +
+
+
+

+ Partagez, twittez, commentez, publiez vos photos…
+ et réservez dès maintenant vos places ou abonnements pour bénéficier de tarifs privilégiés. +

+
+ +
- +
+ {% endif %} +
+
+

{% block title %}{% endblock %}

-
- {% endif %} - -
-
-
-

{% block title %}{% endblock %}

-
-
-
{% block main %}{% endblock %}
-