From 230be5ddd2a551a84fb8cae3ce26b1e234c2c8c9 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 27 May 2019 10:47:32 +0200 Subject: [PATCH] [9.1.08] 100% fluide pas de marge --- core/core.php | 2 +- core/module/theme/view/site/site.js.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index 129675ba..af030538 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;} body{margin:0 auto;} #bar{margin:0 auto;}': ''; + $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']) === '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 97a02bca..e2c1629d 100755 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -48,6 +48,9 @@ $("input, select").on("change", function() { css += ".container{max-width:" + $("#themeSiteWidth").val() + "}"; if ($("#themeSiteWidth").val() === "100%") { css += "#site{margin:0 auto;} body{margin:0 auto;} #bar{margin:0 auto;}"; + } else { + css += "#site{margin:20px auto;} body{margin:0px 10px;} #bar{margin: 0 -10px;}"; + } // Couleur du site, arrondi sur les coins du site et ombre sur les bords du site css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";