diff --git a/CHANGES.md b/CHANGES.md index 79d41ca1..f18cdf2a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ ## version 9.2.17 - Corrections : - Affiche le nom du la page plutôt que son id dans le fil d'ariane. + - Conformité balise p dans span. - Petites corrections. - Modifications : - Image du fond (body), options responsive cover et contain. diff --git a/core/core.php b/core/core.php index f21621d1..caa487f6 100644 --- a/core/core.php +++ b/core/core.php @@ -1220,13 +1220,13 @@ class core extends common { } else { $css .= 'footer{padding:0}'; } - $css .= 'footer span{color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'footer', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}'; + $css .= 'footer span, #footerText > p {color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'footer', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}'; $css .= 'footer{background-color:' . $colors['normal'] . ';color:' . $this->getData(['theme', 'footer', 'textColor']) . '}'; $css .= 'footer a{color:' . $this->getData(['theme', 'footer', 'textColor']) . '}'; $css .= 'footer #footersite > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}'; $css .= 'footer #footerbody > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}'; $css .= '#footerSocials{text-align:' . $this->getData(['theme', 'footer', 'socialsAlign']) . '}'; - $css .= '#footerText{text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}'; + $css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}'; $css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}'; // Enregistre la personnalisation file_put_contents(self::DATA_DIR.'theme.css', $css); @@ -1701,7 +1701,7 @@ class layout extends common { */ public function showFooterText() { if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') { - echo '
' . nl2br($footerText) . '
'; + echo '
' . nl2br($footerText) . '
'; } } diff --git a/core/layout/common.css b/core/layout/common.css index 527a5bab..9e21a7e8 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -612,7 +612,7 @@ footer #footersite > div { footer #footerbody > div { padding:0 } -#footerFontText > p { +#footerFont > p { margin-top: 0; margin-bottom: 0; } diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php index f39d0b61..759d23fb 100755 --- a/core/module/theme/view/footer/footer.js.php +++ b/core/module/theme/view/footer/footer.js.php @@ -30,10 +30,10 @@ $("input, select").on("change", function() { css += "footer #footerbody > div{margin:" + $("#themeFooterHeight").val() + " 0}"; // Alignement du contenu css += "#footerSocials{text-align:" + $("#themeFooterSocialsAlign").val() + "}"; - css += "#footerText{text-align:" + $("#themeFooterTextAlign").val() + "}"; + css += "#footerText > p {text-align:" + $("#themeFooterTextAlign").val() + "}"; css += "#footerCopyright{text-align:" + $("#themeFooterCopyrightAlign").val() + "}"; // Taille, couleur, épaisseur et capitalisation du titre de la bannière - css += "footer span{color:" + $("#themeFooterTextColor").val() + ";font-family:'" + footerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeFooterFontWeight").val() + ";font-size:" + $("#themeFooterFontSize").val() + ";text-transform:" + $("#themeFooterTextTransform").val() + "}"; + css += "footer span, #footerText > p {color:" + $("#themeFooterTextColor").val() + ";font-family:'" + footerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeFooterFontWeight").val() + ";font-size:" + $("#themeFooterFontSize").val() + ";text-transform:" + $("#themeFooterTextTransform").val() + "}"; // Marge if($("#themeFooterMargin").is(":checked")) { css += 'footer{padding: 0 20px;}'; @@ -65,8 +65,8 @@ $("input, select").on("change", function() { break; } // Réduire la marge du paragraphe de la zone de texte enrichie - $("#footerFontText > p").css("margin-top","0"); - $("#footerFontText > p").css("margin-bottom","0"); + $("#footerText > p").css("margin-top","0"); + $("#footerText > p").css("margin-bottom","0"); });