From 0dfe90cd434765d47ad755fafefd105782cba5a5 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Tue, 20 Feb 2018 15:34:25 +0100 Subject: [PATCH] last improvements --- user/config/system.yaml | 4 +- user/themes/ouidade/css/styles.css | 42 +++++++---------- user/themes/ouidade/scss/styles.scss | 46 +++++++++++-------- .../templates/partials/footer.html.twig | 3 +- 4 files changed, 47 insertions(+), 48 deletions(-) diff --git a/user/config/system.yaml b/user/config/system.yaml index 6025983..c817e9d 100644 --- a/user/config/system.yaml +++ b/user/config/system.yaml @@ -24,10 +24,10 @@ twig: autoescape: false assets: - css_pipeline: false + css_pipeline: true css_minify: true css_rewrite: true - js_pipeline: false + js_pipeline: true js_minify: true errors: diff --git a/user/themes/ouidade/css/styles.css b/user/themes/ouidade/css/styles.css index b5358a6..0270c97 100644 --- a/user/themes/ouidade/css/styles.css +++ b/user/themes/ouidade/css/styles.css @@ -7246,7 +7246,7 @@ header#top-bar { */ div#center { padding-top: 11.3em; - padding-bottom: 6em; + padding-bottom: 2.5em; /* * LIST PROJET */ @@ -7275,7 +7275,8 @@ div#center { padding: 0.7em 0.7em 2em; text-align: left; } div#center .projet-block nav.categories { - margin: 0; } + margin: 0; + padding-bottom: 0.2em; } div#center .projet-block nav.categories ul { margin: 0; line-height: 1.2; } @@ -7648,7 +7649,7 @@ div#center { border-width: 5.45455px; } div#center { padding-top: 8.2em; - padding-bottom: 6em; } + padding-bottom: 2.5em; } body.categories a.projet-img { display: none; } } @@ -7661,44 +7662,35 @@ div#center { |_| \___/ \___/ \__\___|_| */ footer#bottom-bar { - position: absolute; + position: fixed; bottom: 0; width: 100%; - height: 5em; + height: 1.5em; background-color: #5b2d87; transition: background-color 0.4s ease-out; color: white; text-align: center; - padding: 0.5em 0; } + padding: 0 0; } footer#bottom-bar:hover { background-color: #e30613; transition: background-color 0.2s ease-in-out; } - footer#bottom-bar h1 { - font: "cocogoose", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; - font-size: 0.95em; - font-weight: 500; - font-variant: normal; - height: auto; - display: inline-block; - position: relative; - margin: 0; - color: inherit; - font-size: 0.75em; } - footer#bottom-bar h1 a { - font-weight: inherit; - color: inherit; } footer#bottom-bar address { + display: inline-block; + vertical-align: baseline; font: "cocogoose", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; font-size: 0.8em; font-weight: 300; font-variant: normal; font-size: 0.6em; - margin: -0.7em 0 0; - line-height: 1.1; - font-style: normal; } - footer#bottom-bar address a { - text-decoration: underline; } + margin: 0 0; + font-style: normal; + margin-right: 1em; } + footer#bottom-bar address:after { + content: "-"; + margin-left: 1em; } footer#bottom-bar ul.footer-menu { + display: inline-block; + vertical-align: baseline; text-align: center; } footer#bottom-bar ul.footer-menu li { display: inline-block; } diff --git a/user/themes/ouidade/scss/styles.scss b/user/themes/ouidade/scss/styles.scss index f53a750..16e9760 100644 --- a/user/themes/ouidade/scss/styles.scss +++ b/user/themes/ouidade/scss/styles.scss @@ -88,7 +88,7 @@ $titleareaH: $logoH+$logo_mb+$logo_mt; $titleReducedFactor:0.7; $titleReducedFactorSmall:0.5; $centerpaddingtop: $headerborderH+$headerpaddingtopH+$titleareaH; -$footerheight: 5em; +$footerheight: 1.5em; $centerpaddingbottom:$footerheight+1em; header#top-bar{ @@ -421,6 +421,7 @@ div#center{ nav.categories{ @include catlist; + padding-bottom: 0.2em; } a.image-link{ @@ -785,43 +786,50 @@ div#center{ |_| \___/ \___/ \__\___|_| */ footer#bottom-bar{ - position:absolute; bottom:0; + position:fixed; bottom:0; width:100%; height:$footerheight; background-color: $maincolor; transition: background-color 0.4s ease-out; color: white; text-align: center; - padding:0.5em 0; + padding:0 0; // margin: 5vh 0 0; &:hover{ background-color: $secondcolor; transition: background-color 0.2s ease-in-out; } - h1{ - @include fontbold; height:auto; display:inline-block; position:relative; margin:0; - color: inherit; - font-size: 0.75em; - a{ - font-weight: inherit; - color: inherit; - } - // &:after{ - // content: ""; height:0; - // display: block; margin-top:-.9em; margin-bottom:1em; - // border-top:0.5em solid #fff; - // transition:border-color 0.3s ease-in;} - } + // h1{ + // display: inline-block; vertical-align:middle; + // @include fontbold; height:auto; display:inline-block; position:relative; margin:0; + // color: inherit;font-size: 0.75em; + // a{font-weight: inherit;color: inherit;} + // margin-right:1em; + // } address{ + display: inline-block; vertical-align:baseline; // font-size: 1em; font-weight: normal; @include fontnormal; font-size: 0.6em; - margin:-0.7em 0 0; line-height: 1.1; font-style: normal; - a{text-decoration: underline;} + margin:0 0; + // a{ + // line-height: 1.5; + // } + font-style: normal; + // a{text-decoration: underline;} + margin-right:1em; + &:after{ + content:"-"; + margin-left: 1em; + } + } ul.footer-menu{ + display: inline-block; vertical-align:baseline; text-align: center; + // line-height: 1; li{ display:inline-block; + // vertical-align:middle; a{ font-size: 0.6em; } diff --git a/user/themes/ouidade/templates/partials/footer.html.twig b/user/themes/ouidade/templates/partials/footer.html.twig index bf36708..f345e55 100644 --- a/user/themes/ouidade/templates/partials/footer.html.twig +++ b/user/themes/ouidade/templates/partials/footer.html.twig @@ -1,9 +1,8 @@