From c7fdb3e997e24c31fa80517b6f7abe0697bfd4d9 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 20 Jun 2019 07:51:56 +0200
Subject: [PATCH] [9.1.13] footer avec marges ok

---
 core/core.php                               | 4 +++-
 core/layout/common.css                      | 4 ++++
 core/module/theme/theme.php                 | 9 +++------
 core/module/theme/view/footer/footer.js.php | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/core.php b/core/core.php
index 6d83e652..d4761f31 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1081,7 +1081,9 @@ class core extends common {
 			// Pied de page
 			$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));
 			if($this->getData(['theme', 'footer', 'margin'])) {
-				$css .= 'footer{margin:0 20px 20px}';
+				$css .= 'footer{margin:0 20px 20px;padding: 1px 20px;}';
+			} else {
+				$css .= 'footer{margin:0;padding:0}';
 			}
 			$css .= 'footer span{color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'footer', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
 			$css .= 'footer{background-color:' . $colors['normal'] . ';color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
diff --git a/core/layout/common.css b/core/layout/common.css
index 3bdbd0a2..e532455f 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -576,6 +576,10 @@ footer {
 	vertical-align: middle;
 }
 
+#footersite {
+	margin: 0;
+}
+
 #footerLoginLink, 
 #footerDisplayCopyright, 
 #footerDisplayVersion,
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index d23cf572..5e624cd5 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -80,19 +80,16 @@ class theme extends common {
 			'left' => 'Bloc Gauche',
 			'center' => 'Bloc Central',
 			'right' => 'Bloc Droite'
-		]
-		
+		]		
 	];
 
-
 	public static $fontWeights = [
 		'normal' => 'Maigre',
 		'bold' => 'Gras'
 	];
 	public static $footerHeights = [
-		'0' => 'Nulles',
-		'10px' => 'Très petites',
-		'15px' => 'Petites',
+		'0' => 'Très petites',
+		'10px' => 'Petites',
 		'20px' => 'Grandes',
 		'30px' => 'Très grandes'
 	];
diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php
index 78ee523f..6b240d42 100755
--- a/core/module/theme/view/footer/footer.js.php
+++ b/core/module/theme/view/footer/footer.js.php
@@ -37,10 +37,10 @@ $("input, select").on("change", function() {
 	css += "footer span{color:" + $("#themeFooterTextColor").val() + ";font-family:'" + footerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeFooterFontWeight").val() + ";font-size:" + $("#themeFooterFontSize").val() + ";text-transform:" + $("#themeFooterTextTransform").val() + "}";
 	// Marge
 	if($("#themeFooterMargin").is(":checked")) {
-		css += 'footer{margin:0 20px 20px}';
+		css += 'footer{margin:0 20px 20px;padding: 1px 20px;}';
 	}
 	else {
-		css += 'footer{margin:0}';
+		css += 'footer{margin:0;padding:0}';
 	}
 	// Ajout du css au DOM
 	$("#themePreview").remove();