ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-02-04 10:22:42 +01:00
parent 2be54777ff 7cc1f3bfef
commit d5f15d97a9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core.php
View File

@ -1228,6 +1228,11 @@ class core extends common {
$css .= '#footerSocials{text-align:' . $this->getData(['theme', 'footer', 'socialsAlign']) . '}';
$css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}';
$css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}';
// Marge supplémentaire lorsque le pied de page est fixe
if ( $this->getData(['theme', 'footer', 'fixed']) === true) {
$css .= "@media (min-width: 769px) { #site {margin-bottom: 100px;} }";
$css .= "@media (max-width: 768px) { #site {margin-bottom: 150px;} }";
}
// Enregistre la personnalisation
file_put_contents(self::DATA_DIR.'theme.css', $css);
}

6
core/layout/common.css
View File

@ -28,7 +28,7 @@ body {
}
@media (min-width: 769px) {
@media (min-width: 768px) {
body {
margin:0px 10px;
}
@ -336,7 +336,7 @@ td > .col12 {
border: 0;
}
@media (min-width: 769px) {
@media (min-width: 768px) {
#bar #barLeft {
float: left;
}
@ -485,7 +485,7 @@ nav a {
nav a:hover {
text-decoration: none;
}
@media (min-width: 769px) {
@media (min-width: 768px) {
nav #menu {
display: block;
}