diff --git a/CHANGES.md b/CHANGES.md index 1445c89d..2e5cf331 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,8 +22,9 @@ - Chargement paresseux des images. ## 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 17cebcf3..4c8994b2 100644 --- a/core/core.php +++ b/core/core.php @@ -1262,7 +1262,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( getData(['theme', 'menu', 'position']) === 'site-first'); ?> - || getData(['theme', 'header', 'position']) === 'body'); ?> + || 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( + getData(['theme', 'menu', 'position']) === 'top'); ?> + ) { + css += 'nav{padding:0 10px;}'; + } + // Ajout du css au DOM $("#themePreview").remove(); $("