diff --git a/core/core.php b/core/core.php index 4d2d9529..33498b07 100755 --- a/core/core.php +++ b/core/core.php @@ -36,7 +36,7 @@ class common { const THUMBS_WIDTH = 640; // Numéro de version - const ZWII_VERSION = '10.1.000'; + const ZWII_VERSION = '10.1.001.dev1'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1536,17 +1536,17 @@ class core extends common { $css .= 'body:not(.editorWysiwyg),span .zwiico-help {color:' . $colors['text'] . ';}'; $css .= 'table tr,input[type=email],input[type=text],input[type=password],select,textarea:not(.editorWysiwyg),.inputFile{color: #222;}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButton'])); - $css .= '.button,input[type="checkbox"]:checked + label::before,.speechBubble{ background-color:' . $colors['normal'] . ';color:' . $this->getData(['admin','colorButtonText']) . ';}'; + $css .= 'input[type="checkbox"]:checked + label::before,.speechBubble{ background-color:' . $colors['normal'] . ';color:' . $this->getData(['admin','colorButtonText']) . ';}'; $css .= '.speechBubble::before {border-color:' . $colors['normal'] . ' transparent transparent transparent;}'; - $css .= '.button:hover, button[type=submit]:hover { background-color:' . $colors['darken'] . ';}'; + $css .= '.button {background:' . $colors['normal'] . ';color:' . $this->getData(['admin','colorButtonText']) . ';}.button:hover {background:' . $colors['darken'] . ';color:' . $this->getData(['admin','colorButtonText']) . ';}.button:active {background:' . $colors['veryDarken'] . ';color:' . $this->getData(['admin','colorButtonText']) . ';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGrey'])); - $css .= '.button.buttonGrey {background: ' . $colors['normal'] . ';color: ' . $this->getData(['admin','colorButtonText']) . ';}.button.buttonGrey:hover {background:' . $colors['darken'] .';color: ' . $this->getData(['admin','colorButtonText']) . '}.button.buttonGrey:active {background:' . $colors['veryDarken'] . ';color: ' . $this->getData(['admin','colorButtonText']) . '}'; + $css .= '.button.buttonGrey {background: ' . $colors['normal'] . ';color: ' . $this->getData(['admin','colorButtonText']) . ';}.button.buttonGrey:hover {background:' . $colors['darken'] . '}.button.buttonGrey:active {background:' . $colors['veryDarken'] . '}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonRed'])); - $css .= '.button.buttonRed {background: ' . $colors['normal'] . ';color: ' . $this->getData(['admin','colorButtonText']) . ';}.button.buttonRed:hover {background:' . $colors['darken'] . ';color: ' . $this->getData(['admin','colorButtonText']) . '}.button.buttonRed:active {background:' . $colors['veryDarken'] . ';color: ' . $this->getData(['admin','colorButtonText']) . '}'; + $css .= '.button.buttonRed {background: ' . $colors['normal'] . ';color: ' . $this->getData(['admin','colorButtonText']) . ';}.button.buttonRed:hover {background:' . $colors['darken'] . '}.button.buttonRed:active {background:' . $colors['veryDarken'] . '}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGreen'])); $css .= 'button[type=submit] {background-color: ' . $colors['normal'] . ';color: ' . $this->getData(['admin','colorButtonText']) . '}button[type=submit]:hover {background-color: ' . $colors['darken'] . ';color: ' . $this->getData(['admin','colorButtonText']) .';}button[type=submit]:active {background-color: ' . $colors['darken'] . ';color: ' . $this->getData(['admin','colorButtonText']) .';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundBlockColor'])); - $css .= '.block {border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}.block h4 {background-color: ' . $colors['normal'] . ';color:' . $colors['text'] . ';}'; + $css .= '.block {border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}.block h4 {background: ' . $colors['normal'] . ';color:' . $colors['text'] . ';}'; // Enregistre la personnalisation file_put_contents(self::DATA_DIR.'admin.css', $css); } diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 673adbc9..36fb5dd2 100755 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -172,7 +172,7 @@ class init extends common { 'fontTitle' => 'Oswald', 'colorText' => 'rgba(33, 34, 35, 1)', 'colorTitle' => 'rgba(74, 105, 189, 1)', - 'colorButtonText' => 'rgba(255, 255, 255, 1)', + 'colorButtonText' => 'rgba(33, 34, 35, 1)', 'backgroundColorButton' => 'rgba(44, 79, 110, 1)', 'backgroundColorButtonGrey' => 'rgba(236, 239, 241, 1)', 'backgroundColorButtonRed' => 'rgba(231, 76, 60, 1)', diff --git a/core/module/theme/view/admin/admin.js.php b/core/module/theme/view/admin/admin.js.php index 4b1083d8..ddcb9fb8 100755 --- a/core/module/theme/view/admin/admin.js.php +++ b/core/module/theme/view/admin/admin.js.php @@ -25,9 +25,9 @@ $("input, select").on("change", function() { css += "body:not(.editorWysiwyg),span .zwiico-help {color:" + colors.text + ";}"; css += "input[type=email],input[type=text],input[type=password],select,textarea:not(.editorWysiwyg),.inputFile{color: #222;}"; var colors = core.colorVariants($("#adminColorButton").val()); - css += ".button,input[type='checkbox']:checked + label::before,.speechBubble{ background-color:" + colors.normal + "; color:" + $("#adminColorButtonText").val() + ";}"; - css += ".speechBubble::before {border-color:" + colors.normal + " transparent transparent transparent;}"; - css += ".button:hover, button[type=submit]:hover { background-color:" + colors.darken + ";}"; + css += "input[type='checkbox']:checked + label::before,.speechBubble{ background-color:" + colors.normal + "; color:" + $("#adminColorButtonText").val() + ";}"; + css += ".speechBubble::before {border-color:" + colors.normal + " transparent transparent transparent;}"; + css += ".button {background:" + colors.normal + ";color:" + $("#adminColorButtonText").val() + ";}.button:hover {background:" + colors.darken + ";color:" + $("#adminColorButtonText").val() + ";}.button:active {background:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + ";}"; var colors = core.colorVariants($("#adminColorGrey").val()); css += ".button.buttonGrey {background: " + colors.normal + ";color:" + $("#adminColorButtonText").val() + ";}.button.buttonGrey:hover {background:" + colors.darken + ";color:" + $("#adminColorButtonText").val() + "}.button.buttonGrey:active {background:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + ";}"; var colors = core.colorVariants($("#adminColorRed").val()); @@ -35,7 +35,7 @@ $("input, select").on("change", function() { var colors = core.colorVariants($("#adminColorGreen").val()); css += "button[type=submit] {background-color: " + colors.normal + ";color: " + ";color:" + $("#adminColorButtonText").val() + "}button[type=submit]:hover {background-color: " + colors.darken + ";color:" + $("#adminColorButtonText").val() + ";}button[type=submit]:active {background:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + "}"; var colors = core.colorVariants($("#adminBackGroundBlockColor").val()); - css += ".block {border: 1px solid " + $("#adminBorderBlockColor").val() + ";}.block h4 {background-color: " + colors.normal + ";color:" + colors.text + ";}"; + css += ".block {border: 1px solid " + $("#adminBorderBlockColor").val() + ";}.block h4 {background: " + colors.normal + ";color:" + colors.text + ";}"; // Ajout du css au DOM $("#themePreview").remove(); diff --git a/core/module/theme/view/admin/admin.php b/core/module/theme/view/admin/admin.php index 5920fee8..4a7e7b25 100755 --- a/core/module/theme/view/admin/admin.php +++ b/core/module/theme/view/admin/admin.php @@ -8,6 +8,11 @@ 'value' => 'Retour' ]); ?> +
+ 'Faux Bouton' + ]); ?> +
'buttonRed',