ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Issues Releases 100 Activity
Browse Source

[9.2.17] conformité p dans span (footer)

pull/5/head
fredtempez 3 years ago
parent
c6af3cfef9
commit
2641659d91
4 changed files with 9 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGES.md
  2. 6
      core/core.php
  3. 2
      core/layout/common.css
  4. 8
      core/module/theme/view/footer/footer.js.php

1
CHANGES.md
Unescape View File

@ -3,6 +3,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.

6
core/core.php
Unescape View File

@ -1206,13 +1206,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);
@ -2070,7 +2070,7 @@ class layout extends common {
*/
public function showFooterText() {
if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') {
echo '<div id="footerText"><span id="footerFontText">' . nl2br($footerText) . '</span></div>';
echo '<div id="footerText">' . nl2br($footerText) . '</div>';
}
}

2
core/layout/common.css
Unescape View File

@ -613,7 +613,7 @@ footer #footersite > div {
footer #footerbody > div {
padding:0
}
#footerFontText > p {
#footerFont > p {
margin-top: 0;
margin-bottom: 0;
}

8
core/module/theme/view/footer/footer.js.php
Unescape View File

@ -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");
});

Write Preview
Loading…
Cancel
Save