remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Merge branch 'master 9.2.28' into dev10

Browse Source
This commit is contained in:
Fred Tempez 2020-04-27 09:14:34 +02:00
commit 3c37807ee5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -36,7 +36,7 @@ class common {
const THUMBS_WIDTH = 640;
// Numéro de version
const ZWII_VERSION = '10.0.071';
const ZWII_VERSION = '10.0.072';
const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = [];

3
core/layout/common.css
View File

@ -632,7 +632,8 @@ section:after {
/* Pied de page */
body > footer {
margin: 0 -10px;
/*margin: 0 -10px;*/
margin: 0;
}
/*

2
core/layout/main.php
View File

@ -203,6 +203,7 @@
<!-- footer -->
<?php
// Déterminer la position
$positionFixed = '';
if(
$this->getData(['theme', 'footer', 'position']) === 'site'
// Affiche toujours le pied de page pour l'édition du thème
@ -211,7 +212,6 @@
AND $this->getUrl(0) === 'theme'
)
) { $position = 'site';
$positionFixed = '';
} else {
$position = 'body';
if ( $this->getData(['theme', 'footer', 'fixed']) === true) {