From 3acbaa72d130a661548379a4fe58550deeec8d93 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Fri, 26 Nov 2021 12:05:07 +0100 Subject: [PATCH] =?UTF-8?q?Bug=20couleur=20arri=C3=A8re=20plan=20de=20la?= =?UTF-8?q?=20banni=C3=A8re=20perso?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/core.php b/core/core.php index b5682eb9..487fde45 100644 --- a/core/core.php +++ b/core/core.php @@ -45,7 +45,7 @@ class common { // Numéro de version const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; - const ZWII_VERSION = '11.2.00.9'; + const ZWII_VERSION = '11.2.00.10'; const ZWII_UPDATE_CHANNEL = "test"; public static $actions = []; @@ -2269,6 +2269,8 @@ class core extends common { $css .= '.mce-tinymce {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) .' !important;}'; // Bannière + + // Eléments communs if($this->getData(['theme', 'header', 'margin'])) { if($this->getData(['theme', 'menu', 'position']) === 'site-first') { $css .= 'header{margin:0 20px}'; @@ -2277,8 +2279,11 @@ class core extends common { $css .= 'header{margin:20px 20px 0 20px}'; } } + $colors = helper::colorVariants($this->getData(['theme', 'header', 'backgroundColor'])); + $css .= 'header{background-color:' . $colors['normal'] . ';}'; + + // Bannière de type papier peint if ($this->getData(['theme','header','feature']) === 'wallpaper' ) { - $colors = helper::colorVariants($this->getData(['theme', 'header', 'backgroundColor'])); $css .= 'header{background-size:' . $this->getData(['theme','header','imageContainer']).'}'; $css .= 'header{background-color:' . $colors['normal']; @@ -2292,9 +2297,11 @@ class core extends common { $colors = helper::colorVariants($this->getData(['theme', 'header', 'textColor'])); $css .= 'header span{color:' . $colors['normal'] . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'header', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'header', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'header', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'header', 'textTransform']) . '}'; } + + // Bannière au contenu personnalisé if ($this->getData(['theme','header','feature']) === 'feature' ) { // Hauteur de la taille du contenu perso - $css .= 'header #featureContent{height:' . $this->getData(['theme', 'header', 'height']) . '; }'; + $css .= 'header #featureContent{height:' . $this->getData(['theme', 'header', 'height']) . ';}'; }