From cd3d1d114bdb5d5a8e3e15f829bc30c28a6da725 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 23 Mar 2020 10:01:12 +0100 Subject: [PATCH 1/4] [9.2.26] marge de la barre d'admin --- core/layout/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/layout/common.css b/core/layout/common.css index acc2ed22..18229044 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -321,7 +321,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; From b1a411f8e749714126093d484c5a714a14c99226 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 23 Mar 2020 10:25:41 +0100 Subject: [PATCH 2/4] [9.2.26] Suppression d'espaces --- core/core.php | 2 +- core/module/config/view/index/index.css | 3 ++- core/module/install/view/update/update.css | 2 +- core/module/page/view/edit/edit.css | 2 +- core/module/theme/view/header/header.css | 2 +- core/module/theme/view/site/site.css | 2 +- core/module/user/view/add/add.css | 2 +- core/module/user/view/edit/edit.css | 2 +- core/module/user/view/index/index.css | 2 +- core/module/user/view/reset/reset.css | 2 +- module/blog/view/add/add.css | 2 +- module/blog/view/comment/comment.css | 2 +- module/blog/view/config/config.css | 2 +- module/blog/view/edit/edit.css | 2 +- module/form/view/config/config.css | 2 +- module/form/view/data/data.css | 2 +- module/gallery/view/config/config.css | 2 +- module/gallery/view/edit/edit.css | 2 +- module/news/view/add/add.css | 2 +- module/news/view/config/config.css | 2 +- module/redirection/view/config/config.css | 2 +- module/redirection/view/index/index.css | 2 +- 22 files changed, 23 insertions(+), 22 deletions(-) diff --git a/core/core.php b/core/core.php index eb67fe0c..ab5f4be1 100644 --- a/core/core.php +++ b/core/core.php @@ -2653,7 +2653,7 @@ class layout extends common { */ public function showStyle() { if($this->core->output['style']) { - echo ''; + echo ''; } } diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css index 191d1c13..9774521b 100644 --- a/core/module/config/view/index/index.css +++ b/core/module/config/view/index/index.css @@ -11,4 +11,5 @@ * @license GNU General Public License, version 3 * @link http://zwiicms.com/ */ - @import url("core/layout/admin.css"); \ No newline at end of file + +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/install/view/update/update.css b/core/module/install/view/update/update.css index af663d8c..1cd24778 100644 --- a/core/module/install/view/update/update.css +++ b/core/module/install/view/update/update.css @@ -14,4 +14,4 @@ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/page/view/edit/edit.css b/core/module/page/view/edit/edit.css index 92452732..3b94602b 100644 --- a/core/module/page/view/edit/edit.css +++ b/core/module/page/view/edit/edit.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css index dcedae12..9774521b 100644 --- a/core/module/theme/view/header/header.css +++ b/core/module/theme/view/header/header.css @@ -12,4 +12,4 @@ * @link http://zwiicms.com/ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css index 92452732..3b94602b 100644 --- a/core/module/theme/view/site/site.css +++ b/core/module/theme/view/site/site.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css index dcedae12..9774521b 100644 --- a/core/module/user/view/add/add.css +++ b/core/module/user/view/add/add.css @@ -12,4 +12,4 @@ * @link http://zwiicms.com/ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/user/view/edit/edit.css b/core/module/user/view/edit/edit.css index 92452732..3b94602b 100644 --- a/core/module/user/view/edit/edit.css +++ b/core/module/user/view/edit/edit.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/user/view/index/index.css b/core/module/user/view/index/index.css index 92452732..3b94602b 100644 --- a/core/module/user/view/index/index.css +++ b/core/module/user/view/index/index.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css index dcedae12..9774521b 100644 --- a/core/module/user/view/reset/reset.css +++ b/core/module/user/view/reset/reset.css @@ -12,4 +12,4 @@ * @link http://zwiicms.com/ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/blog/view/add/add.css b/module/blog/view/add/add.css index 92452732..3b94602b 100644 --- a/module/blog/view/add/add.css +++ b/module/blog/view/add/add.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/blog/view/comment/comment.css b/module/blog/view/comment/comment.css index 92452732..3b94602b 100644 --- a/module/blog/view/comment/comment.css +++ b/module/blog/view/comment/comment.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/blog/view/config/config.css b/module/blog/view/config/config.css index 92452732..3b94602b 100644 --- a/module/blog/view/config/config.css +++ b/module/blog/view/config/config.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/blog/view/edit/edit.css b/module/blog/view/edit/edit.css index 92452732..3b94602b 100644 --- a/module/blog/view/edit/edit.css +++ b/module/blog/view/edit/edit.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/form/view/config/config.css b/module/form/view/config/config.css index 580c8cff..41e81738 100644 --- a/module/form/view/config/config.css +++ b/module/form/view/config/config.css @@ -1,4 +1,4 @@ - @import url("core/layout/admin.css"); +@import url("core/layout/admin.css"); /* .formConfigInput { diff --git a/module/form/view/data/data.css b/module/form/view/data/data.css index 92452732..3b94602b 100644 --- a/module/form/view/data/data.css +++ b/module/form/view/data/data.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/gallery/view/config/config.css b/module/gallery/view/config/config.css index e71b9e57..b8d5a798 100644 --- a/module/gallery/view/config/config.css +++ b/module/gallery/view/config/config.css @@ -13,7 +13,7 @@ */ - @import url("core/layout/admin.css"); +@import url("core/layout/admin.css"); .galleryConfigError { color: #F3674A; diff --git a/module/gallery/view/edit/edit.css b/module/gallery/view/edit/edit.css index 92452732..3b94602b 100644 --- a/module/gallery/view/edit/edit.css +++ b/module/gallery/view/edit/edit.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/news/view/add/add.css b/module/news/view/add/add.css index 92452732..3b94602b 100644 --- a/module/news/view/add/add.css +++ b/module/news/view/add/add.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/news/view/config/config.css b/module/news/view/config/config.css index 92452732..3b94602b 100644 --- a/module/news/view/config/config.css +++ b/module/news/view/config/config.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/redirection/view/config/config.css b/module/redirection/view/config/config.css index 92452732..3b94602b 100644 --- a/module/redirection/view/config/config.css +++ b/module/redirection/view/config/config.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file diff --git a/module/redirection/view/index/index.css b/module/redirection/view/index/index.css index 92452732..3b94602b 100644 --- a/module/redirection/view/index/index.css +++ b/module/redirection/view/index/index.css @@ -13,4 +13,4 @@ */ - @import url("core/layout/admin.css"); \ No newline at end of file +@import url("core/layout/admin.css"); \ No newline at end of file From 7422df69fa3a61c267719fd495fe5cb41577c684 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 23 Mar 2020 10:34:53 +0100 Subject: [PATCH 3/4] =?UTF-8?q?[9.2.26]=20Position=20du=20menu=20lorsque?= =?UTF-8?q?=20le=20header=20est=20modifi=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/theme/theme.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 79f01070..fe98fa48 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -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([ From 8dac462e798cb37015c841b4a331c2ca9c7ae5d2 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 23 Mar 2020 10:36:50 +0100 Subject: [PATCH 4/4] [9.2.26] import style admin --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index ab5f4be1..ac6caaaf 100644 --- a/core/core.php +++ b/core/core.php @@ -2653,7 +2653,7 @@ class layout extends common { */ public function showStyle() { if($this->core->output['style']) { - echo ''; + echo ''; } }