diff --git a/CHANGES.md b/CHANGES.md index b5da65a4..8e1cb512 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,12 @@ # Changelog + +## Version 9.2.1 +- Corrections : + - Thème : prise en compte du fichier custom.css + - Edition de page : libellés + - Marges du pied de page placé hors du site + ## Version 9.2.0 - Nouveautés : - Module de recherche dans le pied de page diff --git a/core/core.php b/core/core.php index b1144b81..2d096cea 100644 --- a/core/core.php +++ b/core/core.php @@ -1100,7 +1100,7 @@ class core extends common { // Pied de page $colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor'])); if($this->getData(['theme', 'footer', 'margin'])) { - $css .= 'footer{margin:0 10px 10px;padding: 1px 10px;}'; + $css .= 'footer{margin:0 10px 10px;padding: 0px 10px;}'; } else { $css .= 'footer{margin:0;padding:0}'; } diff --git a/core/layout/common.css b/core/layout/common.css index 365ea035..f747fbc4 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -568,16 +568,21 @@ section:after { body > footer { margin: 0 -10px; } + +/* footer { padding: 1px 20px; } +*/ -#footersiteRight, #footersiteLeft, #footersiteCenter { - vertical-align: middle; +#footerbody, #footersite { + margin: 0; } -#footersite { - margin: 0; +#footersiteRight, #footersiteLeft, #footersiteCenter, +#footerbodyRight, #footerbodyLeft, #footerbodyCenter { + vertical-align: middle; + padding: 0; } #footerLoginLink, @@ -590,8 +595,6 @@ footer { font-size: inherit; } - - /* Conserve le pied de page sur une ligne */ @media (max-width: 768px) { body > footer { diff --git a/core/layout/main.php b/core/layout/main.php index c2a80637..e9a1cf74 100755 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -219,8 +219,10 @@
+
+
getData(['theme', 'footer', 'template'])) { @@ -245,7 +247,6 @@ $class['right'] = "col12"; break; }?> -
getData(['theme', 'footer', 'textPosition']) === 'left') { $layout->showFooterText(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') { $layout->showSocials(); } diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 2be8d578..a8c57491 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -92,10 +92,10 @@ class theme extends common { 'bold' => 'Gras' ]; public static $footerHeights = [ - '0' => 'Très petites', - '10px' => 'Petites', - '20px' => 'Grandes', - '30px' => 'Très grandes' + '0px' => 'Nulles', + '5px' => 'Petites', + '10px' => 'Moyennes', + '20px' => 'Grandes' ]; public static $footerPositions = [ 'hide' => 'Caché', diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php index 66a24866..f7d3f356 100755 --- a/core/module/theme/view/footer/footer.js.php +++ b/core/module/theme/view/footer/footer.js.php @@ -37,7 +37,7 @@ $("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() + "}"; // Marge if($("#themeFooterMargin").is(":checked")) { - css += 'footer{margin:0 10px 10px;padding: 1px 10px;}'; + css += 'footer{margin:0 10px 10px;padding: 0px 10px;}'; } else { css += 'footer{margin:0;padding:0}'; @@ -76,6 +76,10 @@ $("input, select").on("change", function() { // Bloc texte personnalisé $(".themeFooterContent").on("change",function() { var position = $("#themeFooterPosition").val(); + + //console.log("text : "+ $("#themeFooterTextPosition").val()); + //console.log("socials : " + $("#themeFooterSocialsPosition").val()); + //console.log("copyright: " + $("#themeFooterCopyrightPosition").val()); switch($("#themeFooterTextPosition").val()) { case "hide": $("#footerText").hide(); @@ -143,7 +147,7 @@ $("#themeFooterTemplate").on("change",function() { $("#footerCopyright").hide(); $("#footerText").hide(); $("#footerSocials").hide(); - // Dimension des blocks + // Dimension des blocs switch($("#themeFooterTemplate").val()) { case "1": $("#footer" + position + "Left").css("display","none");