Merge branch 'master 9.2.28' into dev10
This commit is contained in:
commit
3c37807ee5
@ -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 = [];
|
||||
|
@ -632,7 +632,8 @@ section:after {
|
||||
|
||||
/* Pied de page */
|
||||
body > footer {
|
||||
margin: 0 -10px;
|
||||
/*margin: 0 -10px;*/
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user