From 3908d592fe552f6577a01433fcb2dadf2d446a0f Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 27 Jun 2019 12:01:16 +0200
Subject: [PATCH] [9.2.00.dev] masque saisie menu + alignement avec contenu

---
 core/module/theme/view/menu/menu.js.php | 6 +++---
 core/module/theme/view/menu/menu.php    | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php
index f1a02f52..e22d1dba 100755
--- a/core/module/theme/view/menu/menu.js.php
+++ b/core/module/theme/view/menu/menu.js.php
@@ -33,10 +33,10 @@ $("input, select").on("change", function() {
 			<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'site-first'); ?>
 			|| <?php echo json_encode($this->getData(['theme', 'header', 'position']) === 'body'); ?>
 		) {
-			css += 'nav{margin:20px 20px 0 20px}';
+			css += 'nav{padding:20px 20px 0 20px}';
 		}
 		else {
-			css += 'nav{margin:0 20px}';
+			css += 'nav{padding:0 20px}';
 		}
 	}
 	else {
@@ -122,4 +122,4 @@ $("#themeMenuPosition").on("change", function() {
 			$("#themeMenuFixed").prop("checked", false).trigger("change");
 		});
 	}
-}).trigger("change");
\ No newline at end of file
+}).trigger("change");
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index d9e3cb0b..a20195d3 100755
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -44,12 +44,13 @@
 				]); ?>
 			</div>
 	</div>
+    </div>
 	<div class="row">
 		<div class="col12">		
 			<div class="block">
 				<h4>Mise en forme du texte</h4>
 				<div class="row">
-				<div class="col3">
+				    <div class="col3">
 						<?php echo template::select('themeMenuFont', $module::$fonts, [
 								'label' => 'Police',
 								'selected' => $this->getData(['theme', 'menu', 'font'])
@@ -78,7 +79,7 @@
 			<div>
 		</div>
 	</div>
-	<div class="row">
+    <div class="row">
 		<div class="col12">
 			<div class="block">
 				<h4>Configuration</h4>