From d25d31980272b90a010e736749e8ac22e0fda998 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
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 <remi.jean@outlook.com>
  * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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();
 	$("<style>")
diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css
new file mode 100644
index 00000000..94be3bfa
--- /dev/null
+++ b/core/module/user/view/add/add.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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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/user/view/edit/edit.css b/core/module/user/view/edit/edit.css
new file mode 100644
index 00000000..94be3bfa
--- /dev/null
+++ b/core/module/user/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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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/user/view/index/index.css b/core/module/user/view/index/index.css
new file mode 100644
index 00000000..94be3bfa
--- /dev/null
+++ b/core/module/user/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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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/user/view/reset/reset.css b/core/module/user/view/reset/reset.css
new file mode 100644
index 00000000..94be3bfa
--- /dev/null
+++ b/core/module/user/view/reset/reset.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 <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @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/vendor/tinymce/content.css b/core/vendor/tinymce/content.css
index beab260f..310267c2 100755
--- a/core/vendor/tinymce/content.css
+++ b/core/vendor/tinymce/content.css
@@ -3,10 +3,12 @@
  */
 
 /* Fix les problèmes de couleurs et de taille de police */
-.editorWysiwyg {
+.editorWysiwyg {	
 	font-size: 14px !important;
-	background: #FFF !important;
+	/*background: #FFF !important;*/
 }
+
+
 /* Désactive le responsive des cols sinon les cols passent les uns en dessous des autres car la largeur de l'iframe est < au media query utilisé pour le responsive */
 .col1 {
 	width: 8.33333333%;

From 2615198d7addde42c875dd156ebe53b90b589825 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Mon, 16 Mar 2020 08:59:10 +0100
Subject: [PATCH 2/3] [9.2.25] Preview footer ok

---
 core/core.php                               | 2 +-
 core/module/theme/view/footer/footer.js.php | 4 +++-
 core/vendor/tinymce/content.css             | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/core.php b/core/core.php
index 75a04f6b..d4d3f967 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1184,7 +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;}';
+			$css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}';
 			$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/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php
index 22d07823..16a68700 100755
--- a/core/module/theme/view/footer/footer.js.php
+++ b/core/module/theme/view/footer/footer.js.php
@@ -22,8 +22,10 @@ $("input, select").on("change", function() {
 	// Couleurs du pied de page
 	var colors = core.colorVariants($("#themeFooterBackgroundColor").val());
 	var textColor = $("#themeFooterTextColor").val();
-	var css = "footer{background-color:" + colors.normal + ";color:" + textColor + "}";
+	var css = "footer {background-color:" + colors.normal + ";color:" + textColor + "}";	
 	css += "footer a{color:" + textColor + "}";
+	// Couleur de l'éditeur
+	css += ".editorWysiwyg{background-color:" + colors.normal + " !important; color:" + textColor + " !important;}";
 	// Hauteur du pied de page
 	//css += "#footersiteLeft, #footersiteCenter, #footersiteRight, #footerbodyLeft, #footerbodyCenter, #footerbodyRight {margin:" + $("#themeFooterHeight").val() + " 0}";
 	css += "footer #footersite > div{margin:" + $("#themeFooterHeight").val() + " 0}";		
diff --git a/core/vendor/tinymce/content.css b/core/vendor/tinymce/content.css
index 310267c2..57c6cbb3 100755
--- a/core/vendor/tinymce/content.css
+++ b/core/vendor/tinymce/content.css
@@ -5,7 +5,6 @@
 /* Fix les problèmes de couleurs et de taille de police */
 .editorWysiwyg {	
 	font-size: 14px !important;
-	/*background: #FFF !important;*/
 }
 
 

From 8c4ebad69a1199bff824cf2530359339fe887c8f Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Mon, 16 Mar 2020 10:20:25 +0100
Subject: [PATCH 3/3] [9.2.25] Preview du site

---
 core/module/theme/view/site/site.css    |   7 ++
 core/module/theme/view/site/site.js.php |  36 +++++++++
 core/module/theme/view/site/site.php    | 100 ++++++++++++++----------
 3 files changed, 103 insertions(+), 40 deletions(-)

diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css
index 94be3bfa..3a9ba1db 100644
--- a/core/module/theme/view/site/site.css
+++ b/core/module/theme/view/site/site.css
@@ -29,4 +29,11 @@ textarea,
 .button.buttonGrey, 
 .button.buttonGrey:hover {
     color: rgba(33, 34, 35, 1);
+}
+
+div.preview {
+    border-radius: 2%;
+    -webkit-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
+    -moz-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
+    box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
 }
\ 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 21c0daf9..a1f3ec6b 100755
--- a/core/module/theme/view/site/site.js.php
+++ b/core/module/theme/view/site/site.js.php
@@ -10,6 +10,37 @@
  * @link http://zwiicms.com/
  */
 
+ /*
+ * Chargement de l'aperçu
+ */
+$( document ).ready(function() {
+	
+
+	// Import des polices de caractères
+	var titleFont = $("#themeTitleFont").val();
+	var textFont = $("#themeTextFont").val();
+	var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
+	var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
+	
+	
+	css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
+	css += "p.preview{color:" + $("#themeTextTextColor").val() + "}";
+	css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
+
+	// Couleurs des liens
+	colors = core.colorVariants($("#themeLinkTextColor").val());
+	css += "a.preview{color:" + colors.normal + "}";
+	css += "a.preview:hover{color:" + colors.darken + "}";
+
+	// Paramètrage du DOM
+	$("#themePreview").remove();
+	$("<style>")
+		.attr("type", "text/css")
+		.attr("id", "themePreview")
+		.text(css)
+		.appendTo("head");
+});
+
 /**
  * Aperçu en direct
  */
@@ -36,14 +67,18 @@ $("input, select").on("change", function() {
 	colors = core.colorVariants($("#themeLinkTextColor").val());
 	//css += "a{color:" + colors.normal + "}";
 	//css += "a:hover{color:" + colors.darken + "}";
+	css += "a.preview{color:" + colors.normal + "}";
+	css += "a.preview: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.preview,h3.preview{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 += "p.preview{color:" + $("#themeTextTextColor").val() + "}";
 	// Largeur du site
 	css += ".container{max-width:" + $("#themeSiteWidth").val() + "}";
 	if ($("#themeSiteWidth").val() === "100%") {
@@ -55,6 +90,7 @@ $("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{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
+	css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
 	// Ajout du css au DOM
 	$("#themePreview").remove();
 	$("<style>")
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index ea2d1bd3..9fb47d8c 100755
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -17,47 +17,67 @@
 			<div class="block">
 				<h4>Couleurs</h4>
 				<div class="row">
-					<div class="col4">
-						<?php echo template::text('themeSiteBackgroundColor', [
-							'class' => 'colorPicker',
-							'help' => 'Le curseur horizontal règle le niveau de transparence.',							
-							'label' => 'Fond',
-							'value' => $this->getData(['theme', 'site', 'backgroundColor'])
-						]); ?>
+					<div class="col8">
+						<div class="row">
+							<div class="col6">
+								<?php echo template::text('themeSiteBackgroundColor', [
+									'class' => 'colorPicker',
+									'help' => 'Le curseur horizontal règle le niveau de transparence.',							
+									'label' => 'Fond',
+									'value' => $this->getData(['theme', 'site', 'backgroundColor'])
+								]); ?>
+							</div>
+							<div class="col6">
+								<?php echo template::text('themeTextTextColor', [
+									'class' => 'colorPicker',
+									'help' => 'Le curseur horizontal règle le niveau de transparence.',							
+									'label' => 'Texte',
+									'value' => $this->getData(['theme', 'text', 'textColor'])
+								]); ?>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col6">
+								<?php echo template::text('themeTitleTextColor', [
+									'class' => 'colorPicker',
+									'help' => 'Le curseur horizontal règle le niveau de transparence.',							
+									'label' => 'Titres',
+									'value' => $this->getData(['theme', 'title', 'textColor'])
+								]); ?>
+							</div>							
+							<div class="col6">
+								<?php echo template::text('themeLinkTextColor', [
+									'class' => 'colorPicker',
+									'help' => 'Le curseur horizontal règle le niveau de transparence.',							
+									'label' => 'Liens',
+									'value' => $this->getData(['theme', 'link', 'textColor'])
+								]); ?>
+							</div>					
+						</div>
+						<div class="col6 offset3">
+							<?php echo template::text('themeButtonBackgroundColor', [
+								'class' => 'colorPicker',
+								'help' => 'Le curseur horizontal règle le niveau de transparence.',							
+								'label' => 'Boutons',
+								'value' => $this->getData(['theme', 'button', 'backgroundColor'])
+							]); ?>
+						</div>
 					</div>
-					<div class="col4">
-						<?php echo template::text('themeTextTextColor', [
-							'class' => 'colorPicker',
-							'help' => 'Le curseur horizontal règle le niveau de transparence.',							
-							'label' => 'Texte',
-							'value' => $this->getData(['theme', 'text', 'textColor'])
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::text('themeLinkTextColor', [
-							'class' => 'colorPicker',
-							'help' => 'Le curseur horizontal règle le niveau de transparence.',							
-							'label' => 'Liens',
-							'value' => $this->getData(['theme', 'link', 'textColor'])
-						]); ?>
-					</div>					
-				</div>
-				<div class="row">
-					<div class="col4">
-						<?php echo template::text('themeTitleTextColor', [
-							'class' => 'colorPicker',
-							'help' => 'Le curseur horizontal règle le niveau de transparence.',							
-							'label' => 'Titres',
-							'value' => $this->getData(['theme', 'title', 'textColor'])
-						]); ?>
-					</div>
-					<div class="col4 offset4">
-						<?php echo template::text('themeButtonBackgroundColor', [
-							'class' => 'colorPicker',
-							'help' => 'Le curseur horizontal règle le niveau de transparence.',							
-							'label' => 'Boutons',
-							'value' => $this->getData(['theme', 'button', 'backgroundColor'])
-						]); ?>
+					<div class="col4 preview">
+						<h1 class="preview">Aperçu</h1>
+						<div class="row">
+							<div class="col8">
+								<h3 class="preview">Titre 3 </h3>
+								<p class="preview">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+							</div>
+							<div class="col4">
+								<p><a href="#" class="preview">Hyperlien</a></p>
+								<?php echo template::button('themeSiteTest', [
+									'class' => 'buttonPreview',						
+									'value' => 'Test'
+								]); ?>
+							</div>
+						</div>
 					</div>
 				</div>
 			</div>