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

Merge branch 'master' into dev10

Browse Source
This commit is contained in:
Fred Tempez 2020-03-23 10:39:06 +01:00
commit c80d42a571
24 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -2309,7 +2309,7 @@ class layout extends common {
*/
public function showStyle() {
if($this->core->output['style']) {
echo '<style >' . helper::minifyCss($this->core->output['style']) . '</style>';
echo '<style type="text/css">' . helper::minifyCss($this->core->output['style']) . '</style>';
}
}

2
core/layout/common.css
View File

@ -325,7 +325,7 @@ td > .col12 {
#bar {
background: #212223;
padding-left: 5px; /* Pour éviter que le select touche le bord lorsque la fenêtre est redimensionnée */
margin: 0 -10px;
/*margin: 0 -10px;*/
text-align: right;
position: -webkit-sticky; /* Safari */
position: sticky;

1
core/module/config/view/index/index.css
View File

@ -11,4 +11,5 @@
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
@import url("core/layout/admin.css");

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

@ -407,7 +407,11 @@ class theme extends common {
'textAlign' => $this->getData(['theme', 'menu', 'textAlign']),
'textColor' => $this->getData(['theme', 'menu', 'textColor']),
'textTransform' => $this->getData(['theme','menu','textTransform']),
'fixed' => $this->getData(['theme','menu','fixed'])
'fixed' => $this->getData(['theme','menu','fixed']),
'activeColorAuto' => $this->getData(['theme','menu','activeColorAuto']),
'activeColor' => $this->getData(['theme','menu','activeColor']),
'radius' => $this->getData(['theme','menu','radius']),
'burgerTitle' => $this->getData(['theme','menu','burgerTitle'])
]]);
// Valeurs en sortie
$this->addOutput([