From 3caa3f0220a8c9000d9930300c7698d1ce8c3a51 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 18 Mar 2019 14:12:42 +0100 Subject: [PATCH] [9.0.08] 0 margin when width screen max 768px --- .gitignore | 3 ++- CHANGES.md | 4 ++++ core/core.php | 7 +------ core/layout/common.css | 23 ++++++++++++++++++++--- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 702a6d25..851033ec 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ site/file/thumb/* # Trucs .htaccess -.gitignore \ No newline at end of file +.gitignore +core/vendor/tinymce/link_list.json diff --git a/CHANGES.md b/CHANGES.md index 08a981f7..316ef173 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # ChangeLog +## Version 9.0.08 +- Modification : + - Prise en compte taille des petits écrans, suppression des marges + ## Version 9.0.07 - Correction : - Disparition du menu quand la bannière est masquée diff --git a/core/core.php b/core/core.php index d395077a..bd2f132e 100644 --- a/core/core.php +++ b/core/core.php @@ -1279,12 +1279,7 @@ class core extends common { } } $css .= 'header{background-size:' . $this->getData(['theme','header','imageContainer']).'}'; - $css .= 'header{background-color:' . $colors['normal'] . ';height:' . $this->getData(['theme', 'header', 'height']) . ';line-height:' . $this->getData(['theme', 'header', 'height']) . ';text-align:' . $this->getData(['theme', 'header', 'textAlign']) . '}'; - $css .= '@media (max-width: 767px) {header{height:' . - str_replace("px","",$this->getData(['theme', 'header', 'height']))/2 . - 'px;line-height:' . - str_replace("px","",$this->getData(['theme', 'header', 'height']))/2 . - 'px;}}'; + $css .= 'header{background-color:' . $colors['normal'] . ';height:' . $this->getData(['theme', 'header', 'height']) . ';line-height:' . $this->getData(['theme', 'header', 'height']) . ';text-align:' . $this->getData(['theme', 'header', 'textAlign']) . '}'; if($themeHeaderImage = $this->getData(['theme', 'header', 'image'])) { $css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}'; } diff --git a/core/layout/common.css b/core/layout/common.css index 73a45abc..ff5d52b7 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -25,10 +25,24 @@ body { min-height: 100%; } -body { - margin: 0px 10px; + +/** +* Petits écrans inférieurs à 768px de largeur, on supprime les marges +*/ +@media (max-width: 768px) { + body { + margin:0px 0px !important; + } + #site { + margin:0px auto !important; + } } +body { + margin:0px 10px; +} + + /** * Éléments spécifiques */ @@ -428,7 +442,10 @@ nav a:hover { position: sticky; } - +/* Taille du menu hamburger */ +nav .zwiico-menu { + font-size:2em !important; +} /* Corps */