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

merge master

Browse Source
This commit is contained in:
fredtempez 2020-02-11 20:12:51 +01:00
commit 92542e8085
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core.php
View File

@ -33,7 +33,7 @@ class common {
const TEMP_DIR = 'site/tmp/'; const TEMP_DIR = 'site/tmp/';
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.0.031.dev'; const ZWII_VERSION = '10.0.032.dev';
public static $actions = []; public static $actions = [];
public static $coreModuleIds = [ public static $coreModuleIds = [
@ -1709,7 +1709,7 @@ class layout extends common {
*/ */
public function showFooterText() { public function showFooterText() {
if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') { if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') {
echo '<div id="footerText">' . nl2br($footerText) . '</div>'; echo '<div id="footerText">' . $footerText . '</div>';
} }
} }

6
core/layout/common.css
View File

@ -643,12 +643,6 @@ footer #footerbody > div {
font-size: inherit; font-size: inherit;
} }
/* Corrige le problème des <br> dans les col du texte personnalisé */
#footerText div {
display: inline-flex;
float: left;
}
/* Conserve le pied de page sur une ligne */ /* Conserve le pied de page sur une ligne */
@media (max-width: 768px) { @media (max-width: 768px) {
body > footer { body > footer {