From 421d09a3f5fd523b31d089081b395ac627024e66 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 27 May 2019 11:09:18 +0200 Subject: [PATCH] [9.1.08] 100% fluide sans marge --- core/core.php | 2 +- core/module/theme/view/site/site.js.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/core.php b/core/core.php index af030538..5be81b1a 100644 --- a/core/core.php +++ b/core/core.php @@ -970,7 +970,7 @@ class core extends common { $css .= 'body,.row > div{font-size:' . $this->getData(['theme', 'text', 'fontSize']) . '}'; $css .= 'body,.block h4,input[type=\'email\'],input[type=\'text\'],input[type=\'password\'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}'; $css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}'; - $css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;}': ''; + $css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': ''; $css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : ''; $css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223}'; $colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor'])); diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php index e2c1629d..133ae9bb 100755 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -47,9 +47,9 @@ $("input, select").on("change", function() { // Largeur du site css += ".container{max-width:" + $("#themeSiteWidth").val() + "}"; if ($("#themeSiteWidth").val() === "100%") { - css += "#site{margin:0 auto;} body{margin:0 auto;} #bar{margin:0 auto;}"; + css += "#site{margin:0 auto;} body{margin:0 auto;} #bar{margin:0 auto;} body > header{margin:0 auto;} body > nav {margin: 0 auto;} body > footer {margin:0 auto;}"; } else { - css += "#site{margin:20px auto;} body{margin:0px 10px;} #bar{margin: 0 -10px;}"; + css += "#site{margin:20px auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} "; } // Couleur du site, arrondi sur les coins du site et ombre sur les bords du site