Merge branch '10304' into 10400
This commit is contained in:
Fred Tempez
commit
a7b7512ed5
|
|
@ -22,10 +22,13 @@
|
|||
- Thème administration : modification de l'appel du code CSS permettant une mise à jour du thème sans vider le cache.
|
||||
- Thème du menu : alignement inopérant ; arrière-plan semi-transparent non uniforme.
|
||||
- Supprime les warning lors d'une primo installation.
|
||||
- Inversion des icônes + et - dans la configuration
|
||||
- Amélioration :
|
||||
- Thème menu : couleurs du sous menu.
|
||||
- Thème menu : couleurs du sous-menu.
|
||||
- Mise en page du corps des mails de notification.
|
||||
- Paramètres de localisation.
|
||||
- Maintenance terminée, redirection vers l'accueil.
|
||||
- Marge haute dans les vues en mode light.
|
||||
- Modification :
|
||||
- Changement de noms de classe :
|
||||
- navLevel1 devient navMain
|
||||
|
|
|
|||
|
|
@ -1446,6 +1446,10 @@ class common {
|
|||
if ($this->getData(['core', 'dataVersion']) < 10304) {
|
||||
// Couleur des sous menus
|
||||
$this->setData(['theme', 'menu', 'backgroundColorSub', $this->getData(['theme', 'menu', 'backgroundColor']) ]);
|
||||
// Nettoyage du fichier de thème pour forcer une régénération
|
||||
if (file_exists(self::DATA_DIR . '/theme.css')) { // On ne sait jamais
|
||||
unlink (self::DATA_DIR . '/theme.css');
|
||||
}
|
||||
$this->setData(['core', 'dataVersion', 10304]);
|
||||
}
|
||||
// Version 10.4.00
|
||||
|
|
@ -1596,7 +1600,7 @@ class core extends common {
|
|||
//$css .= '.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
|
||||
$css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}';
|
||||
$margin = $this->getData(['theme', 'site', 'margin']) ? '0' : '20px';
|
||||
$css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': "#site{margin: " . $margin . " auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ";
|
||||
$css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site.light{margin:15px auto !important;}#site{margin:0 auto !important;} body{margin:0 auto !important;} #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': "#site.light{margin: 150px auto !important;}#site{margin: " . $margin . " auto !important;} body{margin:0px 10px;} #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ";
|
||||
$css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : '';
|
||||
$css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}';
|
||||
$css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}';
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<?php $layout->showNotification(); ?>
|
||||
<div id="site" class="container">
|
||||
<div id="site" class="container light">
|
||||
<section><?php $layout->showContent(); ?></section>
|
||||
</div>
|
||||
<?php $layout->showScript(); ?>
|
||||
|
|
|
|||
|
|
@ -16,22 +16,18 @@
|
|||
|
||||
/** NE PAS EFFACER
|
||||
* admin.css
|
||||
*/ */
|
||||
|
||||
/** NE PAS EFFACER
|
||||
* admin.css
|
||||
*/
|
||||
*/
|
||||
|
||||
.blockContainer {
|
||||
display : none;
|
||||
}
|
||||
|
||||
#info .zwiico-minus-circled {
|
||||
#info .zwiico-plus-circled {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.zwiico-minus-circled,
|
||||
#info .zwiico-plus-circled {
|
||||
#info .zwiico-minus-circled {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,5 +18,4 @@
|
|||
|
||||
/** NE PAS EFFACER
|
||||
* admin.css
|
||||
*/
|
||||
*/
|
||||
|
|
@ -22,6 +22,11 @@ class maintenance extends common {
|
|||
* Maintenance
|
||||
*/
|
||||
public function index() {
|
||||
// Redirection vers l'accueil après rafraîchissement et que la maintenance est terminée.
|
||||
if($this->getData(['config', 'maintenance']) == False){
|
||||
header('Location:' . helper::baseUrl());
|
||||
exit();
|
||||
}
|
||||
// Page perso définie et existante
|
||||
if ($this->getData(['config','page302']) !== 'none'
|
||||
AND $this->getData(['page',$this->getData(['config','page302'])]) ) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
/* vide */
|
||||
|
|
@ -0,0 +1 @@
|
|||
/* Vide */
|
||||
|
|
@ -27,13 +27,16 @@ footer {
|
|||
position: relative;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.footerbodyFixed {
|
||||
position: relative;
|
||||
z-index: 5;
|
||||
}
|
||||
}
|
||||
|
||||
nav li ul {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#themeShowAll,
|
||||
#themeBack,
|
||||
#themeManage,
|
||||
|
|
@ -42,6 +45,7 @@ nav li ul {
|
|||
position: relative;
|
||||
z-index: 11;
|
||||
}
|
||||
|
||||
.themeOverlay {
|
||||
-webkit-transition: all .3s;
|
||||
transition: all .3s;
|
||||
|
|
@ -56,10 +60,13 @@ nav li ul {
|
|||
display: block;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.themeOverlay:not(.themeOverlayHideBackground):hover,
|
||||
.themeOverlayTriggerHover {
|
||||
background: rgba(39, 174, 96, .5);
|
||||
}
|
||||
|
||||
#themeOverlayBody {
|
||||
position: fixed; /* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/
|
||||
}
|
||||
position: fixed;
|
||||
/* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/
|
||||
}
|
||||
|
|
@ -1,20 +1 @@
|
|||
/**
|
||||
* This file is part of Zwii.
|
||||
*
|
||||
* For full copyright and license information, please see the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*
|
||||
* @author Rémi Jean <remi.jean@outlook.com>
|
||||
* @copyright Copyright (C) 2008-2018, Rémi Jean
|
||||
* @author Frédéric Tempez <frederic.tempez@outlook.com>
|
||||
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
|
||||
* @license GNU General Public License, version 3
|
||||
* @link http://zwiicms.fr/
|
||||
*/
|
||||
|
||||
|
||||
/** @import url("site/data/admin.css"); */
|
||||
|
||||
/** NE PAS EFFACER
|
||||
* admin.css
|
||||
*/
|
||||
/* Vide */
|
||||
|
|
@ -1,13 +1 @@
|
|||
/**
|
||||
* This file is part of Zwii.
|
||||
*
|
||||
* For full copyright and license information, please see the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*
|
||||
* @author Rémi Jean <remi.jean@outlook.com>
|
||||
* @copyright Copyright (C) 2008-2018, Rémi Jean
|
||||
* @author Frédéric Tempez <frederic.tempez@outlook.com>
|
||||
* @copyright Copyright (C) 2018-2020, Frédéric Tempez
|
||||
* @license GNU General Public License, version 3
|
||||
* @link http://zwiicms.fr/
|
||||
*/
|
||||
/** vide */
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
'href' => helper::baseUrl() . $this->getUrl(0) . '/theme/' . $_SESSION['csrf'],
|
||||
'value' => template::ico('brush','right') . 'Thème'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo template::formClose(); ?>
|
||||
<?php echo template::formClose(); ?>
|
||||
<div class="row">
|
||||
<div class="col12">
|
||||
<div class="block">
|
||||
|
|
|
|||
Loading…
Reference in New Issue