From 61897bc6010424219192c3abc6a825c4636f365d Mon Sep 17 00:00:00 2001 From: gloas <gloas@afi-sa.fr> Date: Thu, 21 Feb 2019 17:49:52 +0100 Subject: [PATCH] dev #64573 improve admin icons rendering behavior --- library/ZendAfi/View/Helper/FonctionsAdmin.php | 4 +++- library/ZendAfi/View/Helper/Widget/Section.php | 2 +- library/templates/Intonation/Assets/css/intonation.css | 2 ++ public/admin/css/front_nav.css | 10 +++++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/library/ZendAfi/View/Helper/FonctionsAdmin.php b/library/ZendAfi/View/Helper/FonctionsAdmin.php index 52943878136..2f02c0e2ebb 100644 --- a/library/ZendAfi/View/Helper/FonctionsAdmin.php +++ b/library/ZendAfi/View/Helper/FonctionsAdmin.php @@ -63,7 +63,9 @@ class ZendAfi_View_Helper_FonctionsAdmin extends ZendAfi_View_Helper_BaseHelper return $html ? $this->_tag('div', $html, - ['class' => 'configuration_module', + ['class' => (($this->_widget instanceof Class_Systeme_Widget_Widget) + ? 'configuration_module' + : 'section_configuration'), 'style' => 'text-align:right']) : ''; } diff --git a/library/ZendAfi/View/Helper/Widget/Section.php b/library/ZendAfi/View/Helper/Widget/Section.php index 8a092d9df1b..ba919a5b7c6 100644 --- a/library/ZendAfi/View/Helper/Widget/Section.php +++ b/library/ZendAfi/View/Helper/Widget/Section.php @@ -95,7 +95,7 @@ class ZendAfi_View_Helper_Widget_Section extends ZendAfi_View_Helper_BaseHelper public function getAdminTools() { return $this->_tag('div', $this->view->Admin_TagEditSection($this->_section), - ['class' => 'configuration_module', + ['class' => 'section_configuration', 'style' => 'text-align:right']); } } \ No newline at end of file diff --git a/library/templates/Intonation/Assets/css/intonation.css b/library/templates/Intonation/Assets/css/intonation.css index bbaacc5a7d1..a94f431e867 100644 --- a/library/templates/Intonation/Assets/css/intonation.css +++ b/library/templates/Intonation/Assets/css/intonation.css @@ -413,4 +413,6 @@ main.col, aside.col, healer.col { overflow: hidden; + min-height: 1px; + min-width: 1px; } \ No newline at end of file diff --git a/public/admin/css/front_nav.css b/public/admin/css/front_nav.css index 3a2275c259a..ae87697ea65 100644 --- a/public/admin/css/front_nav.css +++ b/public/admin/css/front_nav.css @@ -83,7 +83,7 @@ body > .menu_admin_front a { body > .menu_admin_front .amdin_menu_title, body > .menu_admin_front form tr, body > .menu_admin_front a { - line-height: 2em; + line-height: 2em; } .menu_admin_front .amdin_menu_title, @@ -144,6 +144,7 @@ body > .menu_admin_front .form select { filter: invert(1); } +#site_web_wrapper[data-show_admin_icons="true"] .section_configuration, #site_web_wrapper[data-show_admin_icons="true"] .configuration_module { z-index: 99; display: block !important; @@ -152,6 +153,10 @@ body > .menu_admin_front .form select { top: 10px; } +#site_web_wrapper[data-show_admin_icons="true"] .section_configuration { + top: 35px; +} + #site_web_wrapper .footer select[onchange], #site_web_wrapper .footer a[href*="/admin"]:not(.menu_admin_front_anchor), #site_web_wrapper .admin_tools_lock, @@ -269,5 +274,4 @@ article header .edit_article { .menu_admin_front a:hover { background-color: var(--line-highlight); -} - +} \ No newline at end of file -- GitLab