From d25d31980272b90a010e736749e8ac22e0fda998 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 15 Mar 2020 20:53:13 +0100 Subject: [PATCH 1/3] [9.2.25] Couleur administration neutre --- core/core.php | 1 + core/module/config/config.php | 2 ++ core/module/config/view/index/index.css | 32 ++++++++++++++++++++ core/module/install/view/update/update.css | 32 ++++++++++++++++++++ core/module/page/view/edit/edit.css | 32 ++++++++++++++++++++ core/module/theme/view/advanced/advanced.css | 32 ++++++++++++++++++++ core/module/theme/view/body/body.css | 19 ++++++++++++ core/module/theme/view/footer/footer.css | 32 ++++++++++++++++++++ core/module/theme/view/header/header.css | 32 ++++++++++++++++++++ core/module/theme/view/index/index.css | 21 +++++++++++++ core/module/theme/view/manage/manage.css | 32 ++++++++++++++++++++ core/module/theme/view/menu/menu.css | 32 ++++++++++++++++++++ core/module/theme/view/site/site.css | 32 ++++++++++++++++++++ core/module/theme/view/site/site.js.php | 13 ++++---- core/module/user/view/add/add.css | 32 ++++++++++++++++++++ core/module/user/view/edit/edit.css | 32 ++++++++++++++++++++ core/module/user/view/index/index.css | 32 ++++++++++++++++++++ core/module/user/view/reset/reset.css | 32 ++++++++++++++++++++ core/vendor/tinymce/content.css | 6 ++-- 19 files changed, 470 insertions(+), 8 deletions(-) create mode 100644 core/module/config/view/index/index.css create mode 100644 core/module/install/view/update/update.css create mode 100644 core/module/page/view/edit/edit.css create mode 100644 core/module/theme/view/advanced/advanced.css create mode 100644 core/module/theme/view/footer/footer.css create mode 100644 core/module/theme/view/header/header.css create mode 100644 core/module/theme/view/manage/manage.css create mode 100644 core/module/theme/view/menu/menu.css create mode 100644 core/module/theme/view/site/site.css create mode 100644 core/module/user/view/add/add.css create mode 100644 core/module/user/view/edit/edit.css create mode 100644 core/module/user/view/index/index.css create mode 100644 core/module/user/view/reset/reset.css diff --git a/core/core.php b/core/core.php index ece7958d..75a04f6b 100644 --- a/core/core.php +++ b/core/core.php @@ -1184,6 +1184,7 @@ class core extends common { $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;}'; + $css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ' !important;}'; $colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor'])); $css .= '.speechBubble,.button,.button:hover,button[type=\'submit\'],.pagination a,.pagination a:hover,input[type=\'checkbox\']:checked + label:before,input[type=\'radio\']:checked + label:before,.helpContent{background-color:' . $colors['normal'] . ';color:' . $colors['text'] . '}'; $css .= '.helpButton span{color:' . $colors['normal'] . '}'; diff --git a/core/module/config/config.php b/core/module/config/config.php index b5577cee..f89c89d6 100755 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -8,6 +8,8 @@ * * @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.com/ */ diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/config/view/index/index.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/install/view/update/update.css b/core/module/install/view/update/update.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/install/view/update/update.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/page/view/edit/edit.css b/core/module/page/view/edit/edit.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/page/view/edit/edit.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/theme/view/advanced/advanced.css b/core/module/theme/view/advanced/advanced.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/theme/view/advanced/advanced.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css index f4e66975..2423d11e 100644 --- a/core/module/theme/view/body/body.css +++ b/core/module/theme/view/body/body.css @@ -13,4 +13,23 @@ #backToTop { display: block; +} + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); } \ No newline at end of file diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/theme/view/footer/footer.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/theme/view/header/header.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css index e0ceb6a5..3786ec1e 100755 --- a/core/module/theme/view/index/index.css +++ b/core/module/theme/view/index/index.css @@ -53,4 +53,25 @@ nav li ul { } #themeOverlayBody { position: fixed; /* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/ +} + +/* Contrastes */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); } \ No newline at end of file diff --git a/core/module/theme/view/manage/manage.css b/core/module/theme/view/manage/manage.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/theme/view/manage/manage.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/theme/view/menu/menu.css b/core/module/theme/view/menu/menu.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/theme/view/menu/menu.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css new file mode 100644 index 00000000..94be3bfa --- /dev/null +++ b/core/module/theme/view/site/site.css @@ -0,0 +1,32 @@ +/** + * 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.com/ + */ + + +#site { + background-color: rgba(255, 255, 255, 1); +} + +body, +.block h4, +input[type="email"], +input[type="text"], +input[type="password"], +.inputFile, +select, +textarea, +.inputFile, +.button.buttonGrey, +.button.buttonGrey:hover { + color: rgba(33, 34, 35, 1); +} \ No newline at end of file diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php index 133ae9bb..21c0daf9 100755 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -22,7 +22,7 @@ $("input, select").on("change", function() { var colors = core.colorVariants($("#themeButtonBackgroundColor").val()); css += ".speechBubble,.button,.button:hover,button[type='submit'],.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,.helpContent{background-color:" + colors.normal + ";color:" + colors.text + "}"; css += ".helpButton span{color:" + colors.normal + "}"; - css += "input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:" + colors.normal + "}"; + //css += "input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:" + colors.normal + "}"; css += ".speechBubble:before{border-color:" + colors.normal + " transparent transparent transparent}"; css += ".button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before{background-color:" + colors.darken + "}"; css += ".helpButton span:hover{color:" + colors.darken + "}"; @@ -34,16 +34,16 @@ $("input, select").on("change", function() { } // Couleurs des liens colors = core.colorVariants($("#themeLinkTextColor").val()); - css += "a{color:" + colors.normal + "}"; - css += "a:hover{color:" + colors.darken + "}"; + //css += "a{color:" + colors.normal + "}"; + //css += "a:hover{color:" + colors.darken + "}"; // Couleur, polices, épaisseur et capitalisation de caractères des titres - css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}"; + //css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}"; // Police de caractères css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}"; // Taille du texte css += "body,.row > div{font-size:" + $("#themeTextFontSize").val() + "}"; // Couleur du texte - 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() + "}"; + //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%") { @@ -53,7 +53,8 @@ $("input, select").on("change", function() { } // 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}"; + //css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}"; + css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}"; // Ajout du css au DOM $("#themePreview").remove(); $("