From f2e6af6dea455b2e7373949c5e22d84f209abcbe Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 4 Nov 2020 09:15:08 +0100 Subject: [PATCH] Light div site marge haute --- core/core.php | 2 +- core/layout/light.php | 2 +- core/module/user/view/forgot/forgot.css | 20 -------------------- module/gallery/view/config/config.php | 4 ++-- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100755 core/module/user/view/forgot/forgot.css diff --git a/core/core.php b/core/core.php index a5808573..c614cb0c 100644 --- a/core/core.php +++ b/core/core.php @@ -1547,7 +1547,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:100px 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: 100px 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']) . ';}'; diff --git a/core/layout/light.php b/core/layout/light.php index c3e3d6db..2c43b144 100644 --- a/core/layout/light.php +++ b/core/layout/light.php @@ -18,7 +18,7 @@ showNotification(); ?> -
+
showContent(); ?>
showScript(); ?> diff --git a/core/module/user/view/forgot/forgot.css b/core/module/user/view/forgot/forgot.css deleted file mode 100755 index 51a18ec5..00000000 --- a/core/module/user/view/forgot/forgot.css +++ /dev/null @@ -1,20 +0,0 @@ -/** - * 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 - * @copyright Copyright (C) 2008-2018, Rémi Jean - * @author Frédéric Tempez - * @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 -*/ \ No newline at end of file diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php index 3ff54341..0c41378b 100644 --- a/module/gallery/view/config/config.php +++ b/module/gallery/view/config/config.php @@ -13,7 +13,7 @@ 'href' => helper::baseUrl() . $this->getUrl(0) . '/theme/' . $_SESSION['csrf'], 'value' => template::ico('brush','right') . 'Thème' ]); ?> -
+
@@ -45,7 +45,7 @@
- +