ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Merge branch 'master' into dev10

Browse Source
This commit is contained in:
Fred Tempez 2020-03-12 09:35:37 +01:00
commit e5a128bdb5
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -22,8 +22,9 @@
- Chargement paresseux des images. - Chargement paresseux des images.
## version 9.2.24 ## version 9.2.24
- Correction : - Corrections :
- Mauvaise configuration de SimpleLightBox - Mauvaise configuration de SimpleLightBox
- Thème : marges du menu en position en-dehors du site
## version 9.2.23 ## version 9.2.23
- Nouveautés : - Nouveautés :

7
core/core.php
View File

@ -1262,7 +1262,12 @@ class core extends common {
} else { } else {
$css .= 'nav{margin:0}'; $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']) . '}'; $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 // Pied de page
$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor'])); $colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));

8
core/module/theme/view/menu/menu.js.php
View File

@ -59,7 +59,7 @@ $("input, select").on("change", function() {
if($("#themeMenuMargin").is(":checked")) { if($("#themeMenuMargin").is(":checked")) {
if( if(
<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'site-first'); ?> <?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}'; css += 'nav{padding: 10px 10px 0 10px}';
} }
@ -70,6 +70,12 @@ $("input, select").on("change", function() {
else { else {
css += 'nav{margin:0;}'; 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 // Ajout du css au DOM
$("#themePreview").remove(); $("#themePreview").remove();
$("<style>") $("<style>")