From 63ae54e2005736610955e5409bf16f293742226f Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 27 May 2019 10:26:11 +0200 Subject: [PATCH 1/5] [9.1.08] Theme 100% sans marge --- CHANGES.md | 3 +++ core/core.php | 3 ++- core/module/theme/view/site/site.js.php | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d64f2391..a3cb70ce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,8 @@ # Changelog +## Version 9.1.08 +- Modification : + - Thème 100% fluide sans marge ## Version 9.1.07 - Correction : - Ajout d'un utilisateur : autres contrôles avant envoi d'un mail de confirmation diff --git a/core/core.php b/core/core.php index 562c0029..f5ba0c30 100644 --- a/core/core.php +++ b/core/core.php @@ -28,7 +28,7 @@ class common { const GROUP_ADMIN = 3; // Numéro de version - const ZWII_VERSION = '9.1.07'; + const ZWII_VERSION = '9.1.08'; public static $actions = []; public static $coreModuleIds = [ @@ -970,6 +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;}': ''; $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 93a3c133..82d50b07 100755 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -46,6 +46,9 @@ $("input, select").on("change", function() { css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}"; // Largeur du site css += ".container{max-width:" + $("#themeSiteWidth").val() + "}"; + if ($("#themeSiteWidth").val() === "100%") { + css += "#site{margin:0 auto;} body{margin:0 auto;}"; + } // 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}"; // Ajout du css au DOM From 6b13d53b8e49d5f452a3d50e00e80cd0cd683ad2 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 27 May 2019 10:26:46 +0200 Subject: [PATCH 2/5] [9.1.08] Theeme 100% sans marge --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index a3cb70ce..85b20807 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ ## Version 9.1.08 - Modification : - Thème 100% fluide sans marge + ## Version 9.1.07 - Correction : - Ajout d'un utilisateur : autres contrôles avant envoi d'un mail de confirmation From 81c99763ca9c89299e7619db47ab451fed6d10f7 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 27 May 2019 10:31:45 +0200 Subject: [PATCH 3/5] =?UTF-8?q?[9.1.08]=20100%=20fluide=20bar=20=C3=A9gale?= =?UTF-8?q?ment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 2 +- core/module/theme/view/site/site.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core.php b/core/core.php index f5ba0c30..129675ba 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;}': ''; + $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']) === '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 82d50b07..97a02bca 100755 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -47,7 +47,7 @@ $("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;}"; + css += "#site{margin:0 auto;} body{margin:0 auto;} #bar{margin:0 auto;}"; } // 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}"; From 230be5ddd2a551a84fb8cae3ce26b1e234c2c8c9 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 27 May 2019 10:47:32 +0200 Subject: [PATCH 4/5] [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}"; From 421d09a3f5fd523b31d089081b395ac627024e66 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 27 May 2019 11:09:18 +0200 Subject: [PATCH 5/5] [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