forked from ZwiiCMS-Team/ZwiiCMS
Merge branch 'master' into dev10
This commit is contained in:
commit
1a5428c671
10
CHANGES.md
10
CHANGES.md
@ -21,6 +21,16 @@
|
|||||||
- Modification :
|
- Modification :
|
||||||
- Chargement paresseux des images.
|
- Chargement paresseux des images.
|
||||||
|
|
||||||
|
## version 9.2.20
|
||||||
|
- Corrections :
|
||||||
|
- Footer / Texte personnalisé : problème d'alignement des colonnes
|
||||||
|
- Variable non déclarée dans main.php provoquant un warning
|
||||||
|
|
||||||
|
## version 9.2.19
|
||||||
|
- Corrections :
|
||||||
|
- CSS : marge bouton InputDelete.
|
||||||
|
- Texte de la page des mentions légales du site d'exemple.
|
||||||
|
|
||||||
## version 9.2.18
|
## version 9.2.18
|
||||||
- Corrections :
|
- Corrections :
|
||||||
- Conformité balise p dans span (footer).
|
- Conformité balise p dans span (footer).
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This file is part of Zwii.
|
* This file is part of Zwii. *
|
||||||
*
|
|
||||||
* For full copyright and license information, please see the LICENSE
|
* For full copyright and license information, please see the LICENSE
|
||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*
|
*
|
||||||
|
@ -643,6 +643,12 @@ 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 {
|
||||||
@ -983,7 +989,6 @@ label {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
float: right;
|
float: right;
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
|
|
||||||
}
|
}
|
||||||
.inputFile:hover {
|
.inputFile:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
@ -210,7 +210,9 @@
|
|||||||
$this->getData(['theme', 'footer', 'position']) === 'hide'
|
$this->getData(['theme', 'footer', 'position']) === 'hide'
|
||||||
AND $this->getUrl(0) === 'theme'
|
AND $this->getUrl(0) === 'theme'
|
||||||
)
|
)
|
||||||
) { $position = 'site'; } else {
|
) { $position = 'site';
|
||||||
|
$positionFixed = '';
|
||||||
|
} else {
|
||||||
$position = 'body';
|
$position = 'body';
|
||||||
if ( $this->getData(['theme', 'footer', 'fixed']) === true) {
|
if ( $this->getData(['theme', 'footer', 'fixed']) === true) {
|
||||||
$positionFixed = 'footerbodyFixed';
|
$positionFixed = 'footerbodyFixed';
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user