lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

[9.1.13] footer avec marges ok

Browse Source
This commit is contained in:
fredtempez 2019-06-20 07:51:56 +02:00
parent f8668168dd
commit c7fdb3e997
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core.php
View File

@ -1081,7 +1081,9 @@ class core extends common {
// Pied de page // Pied de page
$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor'])); $colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));
if($this->getData(['theme', 'footer', 'margin'])) { if($this->getData(['theme', 'footer', 'margin'])) {
$css .= 'footer{margin:0 20px 20px}'; $css .= 'footer{margin:0 20px 20px;padding: 1px 20px;}';
} else {
$css .= 'footer{margin:0;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{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{background-color:' . $colors['normal'] . ';color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';

4
core/layout/common.css
View File

@ -576,6 +576,10 @@ footer {
vertical-align: middle; vertical-align: middle;
} }
#footersite {
margin: 0;
}
#footerLoginLink, #footerLoginLink,
#footerDisplayCopyright, #footerDisplayCopyright,
#footerDisplayVersion, #footerDisplayVersion,

7
core/module/theme/theme.php
View File

@ -81,18 +81,15 @@ class theme extends common {
'center' => 'Bloc Central', 'center' => 'Bloc Central',
'right' => 'Bloc Droite' 'right' => 'Bloc Droite'
] ]
]; ];
public static $fontWeights = [ public static $fontWeights = [
'normal' => 'Maigre', 'normal' => 'Maigre',
'bold' => 'Gras' 'bold' => 'Gras'
]; ];
public static $footerHeights = [ public static $footerHeights = [
'0' => 'Nulles', '0' => 'Très petites',
'10px' => 'Très petites', '10px' => 'Petites',
'15px' => 'Petites',
'20px' => 'Grandes', '20px' => 'Grandes',
'30px' => 'Très grandes' '30px' => 'Très grandes'
]; ];

4
core/module/theme/view/footer/footer.js.php
View File

@ -37,10 +37,10 @@ $("input, select").on("change", function() {
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{color:" + $("#themeFooterTextColor").val() + ";font-family:'" + footerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeFooterFontWeight").val() + ";font-size:" + $("#themeFooterFontSize").val() + ";text-transform:" + $("#themeFooterTextTransform").val() + "}";
// Marge // Marge
if($("#themeFooterMargin").is(":checked")) { if($("#themeFooterMargin").is(":checked")) {
css += 'footer{margin:0 20px 20px}'; css += 'footer{margin:0 20px 20px;padding: 1px 20px;}';
} }
else { else {
css += 'footer{margin:0}'; css += 'footer{margin:0;padding:0}';
} }
// Ajout du css au DOM // Ajout du css au DOM
$("#themePreview").remove(); $("#themePreview").remove();