remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

10.2.dev35 selecteur de pages en mode sombre

Browse Source
This commit is contained in:
Fred Tempez 2020-06-16 18:44:26 +02:00
parent 7df3330bb5
commit 7c6befaa20
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core.php
View File

@ -39,7 +39,7 @@ class common {
const ACCESS_TIMER = 1800;
// Numéro de version
const ZWII_VERSION = '10.2.00.dev34';
const ZWII_VERSION = '10.2.00.dev35';
const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = [];
@ -1311,7 +1311,7 @@ class common {
$this->setdata(['theme','block','borderColor','rgba(236, 239, 241, 1)']);
$this->setdata(['theme','menu','radius','0px']);
$this->setData(['core', 'dataVersion', 10104]);
}
}
// Version 10.2.00
if ($this->getData(['core', 'dataVersion']) < 10200) {
$this->deleteData(['admin','colorButtonText']);
@ -1427,7 +1427,7 @@ class core extends common {
$css .= 'body,.block h4{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
// spécifiques au module de blog
$css .= '.blogDate {color:' . $this->getData(['theme', 'text', 'textColor']) . ';}.blogPicture img{border:1px solid ' . $this->getData(['theme', 'text', 'textColor']) . '; box-shadow: 1px 1px 5px ' . $this->getData(['theme', 'text', 'textColor']) . ';}';
$css .= 'select,input[type=\'email\'],input[type=\'text\'],textarea{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
$css .= 'select,input[type=\'email\'],input[type=\'text\'],textarea{color:' . $this->getData(['theme', 'text', 'textColor']) .';background-color:'.$this->getData(['theme', 'site', 'backgroundColor']).';}';
// Couleur fixée dans admin.css
//$css .= '.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
$css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}';
@ -1449,6 +1449,7 @@ class core extends common {
// Les blocs
$colors = helper::colorVariants($this->getData(['theme', 'block', 'backgroundColor']));
$css .= '.block {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) . ';}.block h4 {background-color:'. $colors['normal'] . ';color:' . $colors['text'] .';}';
$css .= '.mce-tinymce {border: 1px solid ' . $this->getdata(['theme','block','borderColor']) .' !important;}';
// Bannière
$colors = helper::colorVariants($this->getData(['theme', 'header', 'backgroundColor']));
if($this->getData(['theme', 'header', 'margin'])) {

47
core/layout/common.css
View File

@ -20,7 +20,7 @@
/**
* Éléments génériques
*/
html,
body {
@ -39,7 +39,7 @@ body {
/**
* Petits écrans inférieurs à 768px de largeur, on supprime les marges
*/
*/
@media (max-width: 768px) {
body {
margin:0px;
@ -60,7 +60,7 @@ body {
@media (max-width: 768px) {
@media (max-width: 768px) {
.siteContainer {
display: flex;
flex-direction: column;
@ -370,14 +370,15 @@ td > .col12 {
#bar select {
width: 250px;
border: 0;
color: #111112;
color: #111112;
font-size: 12px;
background-color: rgba(255, 255, 255, 1);
}
@media (min-width: 768px) {
#bar #barLeft {
float: left;
}
}
#bar #barRight {
float: right;
font-size: 12px;
@ -398,12 +399,12 @@ td > .col12 {
font-size: 0.6em;
}
#bar #barLeft {
font-size: 1.6em;
float : none;
font-size: 1.6em;
float : none;
}
#bar #barRight {
font-size: 1.6em;
}
font-size: 1.6em;
}
#bar #displayUsername {
display: none;
}
@ -416,7 +417,7 @@ td > .col12 {
}
@media (min-width:769px) {
#site {
#site {
margin: 20px auto;
}
}
@ -429,7 +430,7 @@ td > .col12 {
}
header {
margin:0;
}
}
}
header {
@ -501,7 +502,7 @@ nav li ul {
opacity: 0;
-webkit-transition: .3s ease-out;
transition: .3s ease-out;
padding-left: 10px;
padding-left: 10px;
}
nav li ul li {
@ -535,7 +536,7 @@ nav a:hover {
}
nav #toggle {
display: block;
}
}
nav #menu {
display: none;
text-align: left;
@ -553,14 +554,14 @@ nav a:hover {
/* Taille du menu hamburger */
nav .zwiico-menu {
font-size:1.5em;
}
}
nav .zwiico-cancel {
font-size:1.5em;
}
}
/* Barre de navigation fixe quand le menu est en-dehors du site */
/* Barre de navigation fixe quand le menu est en-dehors du site */
#navfixedlogout {
position: -webkit-sticky; /* Safari */
position: sticky;
@ -622,7 +623,7 @@ section:after {
.moduleVersion {
font-size: 0.8em;
font-style: italic;
text-align: right;
text-align: right;
}
/* Pied de page */
@ -666,12 +667,12 @@ footer #footerbody > div {
padding:0
}
#footerText > p {
margin-top: 0;
margin-top: 0;
margin-bottom: 0;
}
#footerLoginLink,
#footerDisplayCopyright,
#footerLoginLink,
#footerDisplayCopyright,
#footerDisplayVersion,
#footerDisplaySiteMap,
#footerDisplayLegal,
@ -863,7 +864,7 @@ footer #footerSocials .zwiico-github:hover {
width: 100vw;
max-width: 500px;
padding: 20px;
}
.lightbox > span {
color: black;
@ -916,7 +917,7 @@ input[type='password'].notice,
select.notice,
textarea.notice {
border: 1px solid #E74C3C;
background: #FAD7D3;
/*background: #FAD7D3;*/
}
input[type='email'].notice:hover,
input[type='text'].notice:hover,
@ -978,7 +979,7 @@ label {
-webkit-transition: background .3s ease-out;
transition: background .3s ease-out;
}
/* Bouton redimensionnable pour le formulaire*/
/* Bouton redimensionnable pour le formulaire*/
#formSubmit {
width: max-content;
float: right;
@ -1335,7 +1336,7 @@ th.col12 {
.accordion {
padding: 0;
list-style: none;
list-style: none;
}
.accordion-title {
display: block;