From 2562138de5888eedbb34dab515730e2356fd330c Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 12 Mar 2020 09:35:18 +0100
Subject: [PATCH] =?UTF-8?q?[9.2.24]=20erreur=20th=C3=A8me=20menu=20:=20mar?=
 =?UTF-8?q?ge=20gauche?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                              | 3 ++-
 core/core.php                           | 7 ++++++-
 core/module/theme/view/menu/menu.js.php | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3bdf134c..56258375 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,9 @@
 # Changelog
 
 ## version 9.2.24
-- Correction : 
+- Corrections : 
     - Mauvaise configuration de SimpleLightBox
+    - Thème : marges du menu en position en-dehors du site
 
 ## version 9.2.23
 - Nouveautés : 
diff --git a/core/core.php b/core/core.php
index d53ef323..ab2e2422 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1244,7 +1244,12 @@ class core extends common {
 			} else {
 				$css .= 'nav{margin:0}';
 			}
-			
+			if(
+				$this->getData(['theme', 'menu', 'position']) === 'top'
+				) {
+					$css .= 'nav{padding:0 10px;}';
+			}
+
 			$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'menu', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';			
 			// Pied de page
 			$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));
diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php
index 8e48c9e0..0e10e7ef 100755
--- a/core/module/theme/view/menu/menu.js.php
+++ b/core/module/theme/view/menu/menu.js.php
@@ -59,7 +59,7 @@ $("input, select").on("change", function() {
 	if($("#themeMenuMargin").is(":checked")) {
 		if(
 			<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'site-first'); ?>
-			|| <?php echo json_encode($this->getData(['theme', 'header', 'position']) === 'body'); ?>
+			|| <?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'site-second'); ?>
 		) {
 			css += 'nav{padding: 10px 10px 0 10px}';
 		}
@@ -70,6 +70,12 @@ $("input, select").on("change", function() {
 	else {
 		css += 'nav{margin:0;}';
 	}
+    if(
+		<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'top'); ?>
+	) {
+		css += 'nav{padding:0 10px;}';
+	}
+
 	// Ajout du css au DOM
 	$("#themePreview").remove();
 	$("<style>")