forked from ZwiiCMS-Team/ZwiiCMS
Merge branch 'master' of https://github.com/fredtempez/ZwiiCMS
This commit is contained in:
commit
a56244937b
@ -1,5 +1,9 @@
|
||||
# Changelog
|
||||
|
||||
## Version 9.1.08
|
||||
- Modification :
|
||||
- Thème 100% fluide sans marge
|
||||
|
||||
## Version 9.1.07
|
||||
- Correction :
|
||||
- Ajout d'un utilisateur : autres contrôles avant envoi d'un mail de confirmation
|
||||
|
@ -28,7 +28,7 @@ class common {
|
||||
const GROUP_ADMIN = 3;
|
||||
|
||||
// Numéro de version
|
||||
const ZWII_VERSION = '9.1.07';
|
||||
const ZWII_VERSION = '9.1.08';
|
||||
|
||||
public static $actions = [];
|
||||
public static $coreModuleIds = [
|
||||
@ -970,6 +970,7 @@ class core extends common {
|
||||
$css .= 'body,.row > div{font-size:' . $this->getData(['theme', 'text', 'fontSize']) . '}';
|
||||
$css .= 'body,.block h4,input[type=\'email\'],input[type=\'text\'],input[type=\'password\'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
|
||||
$css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}';
|
||||
$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;}': '';
|
||||
$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}';
|
||||
$colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor']));
|
||||
|
@ -46,6 +46,12 @@ $("input, select").on("change", function() {
|
||||
css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}";
|
||||
// Largeur du site
|
||||
css += ".container{max-width:" + $("#themeSiteWidth").val() + "}";
|
||||
if ($("#themeSiteWidth").val() === "100%") {
|
||||
css += "#site{margin:0 auto;} body{margin:0 auto;} #bar{margin:0 auto;} body > header{margin:0 auto;} body > nav {margin: 0 auto;} body > footer {margin:0 auto;}";
|
||||
} else {
|
||||
css += "#site{margin:20px 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;} ";
|
||||
|
||||
}
|
||||
// Couleur du site, arrondi sur les coins du site et ombre sur les bords du site
|
||||
css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
|
||||
// Ajout du css au DOM
|
||||
|
Loading…
Reference in New Issue
Block a user