ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-02-04 13:23:24 +01:00
parent d5f15d97a9 de791a977a
commit 6c283cebad
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core.php
View File

@ -1229,7 +1229,8 @@ class core extends common {
$css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}'; $css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}';
$css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}'; $css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}';
// Marge supplémentaire lorsque le pied de page est fixe // Marge supplémentaire lorsque le pied de page est fixe
if ( $this->getData(['theme', 'footer', 'fixed']) === true) { if ( $this->getData(['theme', 'footer', 'fixed']) === true &&
$this->getData(['theme', 'footer', 'position']) === 'body') {
$css .= "@media (min-width: 769px) { #site {margin-bottom: 100px;} }"; $css .= "@media (min-width: 769px) { #site {margin-bottom: 100px;} }";
$css .= "@media (max-width: 768px) { #site {margin-bottom: 150px;} }"; $css .= "@media (max-width: 768px) { #site {margin-bottom: 150px;} }";
} }

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

@ -214,7 +214,7 @@ $("#themeFooterPosition").on("change", function() {
} }
else { else {
$("#themeFooterPositionFixed").slideUp(function() { $("#themeFooterPositionFixed").slideUp(function() {
$("#themeFooterPositionFixed").prop("checked", false).trigger("change"); $("#themeFooterFixed").prop("checked", false).trigger("change");
}); });
} }
}).trigger("change"); }).trigger("change");