From: Jérémy Fabre Date: Wed, 20 Jul 2016 09:00:30 +0000 (+0200) Subject: Header, footer and basicpage update X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8bea9b4fb05c2c2ba0bbe4fb79e2b298802a66fc;p=mezzo.git Header, footer and basicpage update --- diff --git a/app/static/src/assets/img/logo-ircam-white.png b/app/static/src/assets/img/logo-ircam-white.png new file mode 100644 index 00000000..25b17273 Binary files /dev/null and b/app/static/src/assets/img/logo-ircam-white.png differ diff --git a/app/static/src/assets/img/partners/logo-cnrs.png b/app/static/src/assets/img/partners/logo-cnrs.png new file mode 100644 index 00000000..8386e987 Binary files /dev/null and b/app/static/src/assets/img/partners/logo-cnrs.png differ diff --git a/app/static/src/assets/img/partners/logo-inria.png b/app/static/src/assets/img/partners/logo-inria.png new file mode 100644 index 00000000..5e23e27b Binary files /dev/null and b/app/static/src/assets/img/partners/logo-inria.png differ diff --git a/app/static/src/assets/img/partners/logo-ministere-culture.png b/app/static/src/assets/img/partners/logo-ministere-culture.png new file mode 100644 index 00000000..c283cc3f Binary files /dev/null and b/app/static/src/assets/img/partners/logo-ministere-culture.png differ diff --git a/app/static/src/assets/img/partners/logo-upmc.png b/app/static/src/assets/img/partners/logo-upmc.png new file mode 100644 index 00000000..1a4c6161 Binary files /dev/null and b/app/static/src/assets/img/partners/logo-upmc.png differ diff --git a/app/static/src/sass/global/_helpers.scss b/app/static/src/sass/global/_helpers.scss index 8cba3fd8..00a4d276 100755 --- a/app/static/src/sass/global/_helpers.scss +++ b/app/static/src/sass/global/_helpers.scss @@ -92,3 +92,8 @@ .fsxs { @include font-size(xs); } +.unstyled-list { + list-style-type: none; + margin: 0; + padding: 0; +} diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss index 4fccd852..463ea3d7 100755 --- a/app/static/src/sass/global/_typography.scss +++ b/app/static/src/sass/global/_typography.scss @@ -23,7 +23,7 @@ h1, h2, h3 { h1 { @include typeset(heading-1); @include typeface(sans-serif); - @include margin-bottom(1); + @include margin-bottom(3); @include margin-top(1); } @@ -104,7 +104,6 @@ figure { @include font-size(l); @include line-height(1.25); @include typeface(serif); - @include margin-top(5); @include margin-bottom(3); font-weight: weight(heavy); } diff --git a/app/static/src/sass/layout/_footer.scss b/app/static/src/sass/layout/_footer.scss index cc44de10..fddf99ee 100755 --- a/app/static/src/sass/layout/_footer.scss +++ b/app/static/src/sass/layout/_footer.scss @@ -2,6 +2,79 @@ $module: ".footer"; #{$module} { - + &__pre { + + background: $color-black; + border-bottom: 3px solid white; + color: white; + + @include padding(1 0); + + } + + &__content { + + background: #8e8e8e; + + @include padding(1 0); + + @include font-size(s); + @include typeface(sans-serif); + font-weight: weight(light); + + color: white; + + } + + &__follow-link { + + color: white; + @include font-size(xxl); + display: inline-block; + + @include margin(0 .25); + @include transition(all 0.5s ease-in-out); + + &:hover { + &.facebook { + color: $color-facebook; + } + &.twitter { + color: $color-twitter; + } + &.instagram { + color: $color-instagram; + } + &.youtube { + color: $color-youtube; + } + &.vimeo { + color: $color-vimeo; + } + } + + } + + &__link { + + color: white; + border-bottom: 1px solid $color-main; + font-weight: weight(regular); + + } + + &__separator { + + width: 100%; + background: white; + height: 3px; + + @include margin(1 0); + + &--small { + height: 1px; + } + + } } diff --git a/app/static/src/sass/layout/_global.scss b/app/static/src/sass/layout/_global.scss index 6e7d4aed..89e3d1ee 100755 --- a/app/static/src/sass/layout/_global.scss +++ b/app/static/src/sass/layout/_global.scss @@ -1,7 +1,6 @@ -.section { - @include margin-top(4); +.main { + @include margin(3 0 0 0); + @include padding(1 0 0 0); - &:first-child { - margin-top: 0; - } + background: white; } diff --git a/app/static/src/sass/modules/_all.scss b/app/static/src/sass/modules/_all.scss index e46c4217..d52ffebd 100755 --- a/app/static/src/sass/modules/_all.scss +++ b/app/static/src/sass/modules/_all.scss @@ -1,6 +1,7 @@ // Navs @import "navs/nav-actions"; @import "navs/nav-header"; +@import "navs/nav-footer"; @import 'breadcrumb'; @import 'lang-switcher'; diff --git a/app/static/src/sass/modules/navs/_nav-footer.scss b/app/static/src/sass/modules/navs/_nav-footer.scss new file mode 100644 index 00000000..4a7c4713 --- /dev/null +++ b/app/static/src/sass/modules/navs/_nav-footer.scss @@ -0,0 +1,17 @@ +$module: ".nav-footer"; + +#{$module} { + + list-style-type: none; + margin: 0; + padding: 0; + text-align: left; + + &__item-link { + @include font-size(m); + @include typeface(sans-serif); + font-weight: weight(regular); + color: white; + } + +} diff --git a/app/templates/base.html b/app/templates/base.html index eac5ed0a..f691a067 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -40,17 +40,6 @@ - {% nevercache %} - {% if messages %} - {% for message in messages %} -
- - {{ message }} -
- {% endfor %} - {% endif %} - {% endnevercache %} -