From 3bbb14b217d18a500cf2d499ea69151414299f27 Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Tue, 16 Nov 2021 14:37:50 +0100
Subject: [PATCH] =?UTF-8?q?Aper=C3=A7u=20des=20marges=20header=20dans=20le?=
 =?UTF-8?q?=20site?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/theme/view/header/header.js.php | 27 ++++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php
index 263dc623..8ac5768b 100644
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@@ -27,14 +27,16 @@ $("input, select").on("change", function() {
 	// Contenu perso
 	if ($("#themeHeaderFeature").val() == "feature") {
 		
-		css = "header{height:" + $("#themeHeaderHeight").val() + "; overflow:hidden;background-position:top; background-repeat: no-repeat;;line-height:1.15;background-color:unset;;background-image:unset;text-align:unset}";
+		css = "header{height:" + $("#themeHeaderHeight").val() + "; overflow:hidden; background-position:top; background-repeat: no-repeat; line-height:1.15; background-color:unset; background-image:unset; text-align:unset;}";
 		
 		$("#featureContent").appendTo("header").show();
 		$("#themeHeaderTitle").hide();
 
 		// Modifier le texte du sélecteur de hauteur
 		$("#themeHeaderHeight option:eq(0)").text("Hauteur du contenu personnalisé");
+
 	}
+	
 
 	// Couleurs, image, alignement et hauteur de la bannière
 	if ($("#themeHeaderFeature").val() == "wallpaper") {
@@ -104,19 +106,9 @@ $("input, select").on("change", function() {
 		else {
 			$("#themeHeaderTitle").show();
 		}
-
-		// Marge
-		if($("#themeHeaderMargin").is(":checked")) {
-			if(<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'site-first'); ?>) {
-				css += 'header{margin:0 20px}';
-			} else {
-				css += 'header{margin:20px 20px 0 20px}';
-			}
-		} else {
-			css += 'header{margin:0}';
-		}
 	}
 
+
 	// Position de la bannière
 	var positionNav = <?php echo json_encode($this->getData(['theme', 'menu', 'position'])); ?>;
 	var positionHeader = $("#themeHeaderPosition").val();
@@ -170,6 +162,15 @@ $("input, select").on("change", function() {
 			}
 	}
 
+	// Marge dans le site
+	if(	$("#themeHeaderMargin").is(":checked") &&
+		$("#themeHeaderPosition").val() === "site"
+		) {			console.log("truc")	;
+			css += 'header{margin:20px 20px 0 20px !important;}';
+		/*} else { console.log("truc2")	;
+			css += 'header{margin:0 !important;}';*/
+    }
+
 	// Largeur du header
 	switch ($("#themeHeaderWide").val()) {
 		case "container":
@@ -223,12 +224,14 @@ $("#themeHeaderPosition").on("change", function() {
 		$("#themeHeaderContainerWrapper").slideUp();
 		$("#themeHeaderWideWrapper").slideUp();
 		$("#themeHeaderMarginWrapper").slideUp();
+		$("#themeHeaderMargin").prop("checked", false);
 		$("#themeHeaderPositionOptions").slideUp(function() {
 			$("#themeHeaderMargin").prop("checked", false).trigger("change");
 		});
 	} else {
 		$("#themeHeaderWideWrapper").slideDown();
 		$("#themeHeaderMarginWrapper").slideUp();
+		$("#themeHeaderMargin").prop("checked", false);
 	}
 }).trigger("change");