From 4843b93366478c1b1011f44cb19e7c24a8bfba2b Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Tue, 2 Jun 2020 12:10:06 +0200 Subject: [PATCH] 10.2.dev22 erreur defaultdata css --- core/core.php | 4 ++-- core/module/install/ressource/defaultdata.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/core.php b/core/core.php index 3f467d6e..1d5a71c1 100755 --- a/core/core.php +++ b/core/core.php @@ -39,7 +39,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.2.00.dev21'; + const ZWII_VERSION = '10.2.00.dev22'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1417,7 +1417,7 @@ class core extends common { $css .= 'body,.block h4{color:' . $this->getData(['theme', 'text', 'textColor']) . '}'; // spécifiques au module de blog $css .= '.blogDate {color:' . $this->getData(['theme', 'text', 'textColor']) . ';}.blogPicture img{border:1px solid ' . $this->getData(['theme', 'text', 'textColor']) . '; box-shadow: 1px 1px 5px ' . $this->getData(['theme', 'text', 'textColor']) . ';}'; - $css .= 'select,input[type=\'email\'],input[type=\'text\'],textarea{color:' . $this->getData(['theme', 'text', 'backgroundColor']) . '}'; + $css .= 'select,input[type=\'email\'],input[type=\'text\'],textarea{color:' . $this->getData(['theme', 'site', 'backgroundColor']) . '}'; // Couleur fixée dans admin.css //$css .= '.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}'; $css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}'; diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 24d93115..a31d08dc 100755 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -145,7 +145,8 @@ class init extends common { 'fixed' => false, 'activeColorAuto' => true, 'activeColor' => 'rgba(255, 255, 255, 1)', - 'activeTextColor' => 'rgba(255, 255, 255, 1)' + 'activeTextColor' => 'rgba(255, 255, 255, 1)', + 'radius' => '0px' ], 'site' => [ 'backgroundColor' => 'rgba(255, 255, 255, 1)',