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:
fredtempez 2019-11-12 19:02:25 +01:00
commit 36d847c5c6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -1315,7 +1315,7 @@ class core extends common {
// Pied de page
$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));
if($this->getData(['theme', 'footer', 'margin'])) {
$css .= 'footer{padding:0 10px;}';
$css .= 'footer{padding:0 20px;}';
} else {
$css .= 'footer{padding:0}';
}

2
core/module/theme/view/footer/footer.js.php
View File

@ -36,7 +36,7 @@ $("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{padding: 0 10px;}';
css += 'footer{padding: 0 20px;}';
}
else {
css += 'footer{padding:0}';

2
core/module/theme/view/footer/footer.php
View File

@ -190,7 +190,7 @@
</div>
<div class="col6">
<div id="themeFooterPositionOptions">
<?php echo template::checkbox('themeFooterMargin', true, 'Alignement sur une marge horizontale', [
<?php echo template::checkbox('themeFooterMargin', true, 'Alignement avec le contenu', [
'checked' => $this->getData(['theme', 'footer', 'margin'])
]); ?>
</div>