From 7fefa822cc37db8f1ccccd0013db2cb2d900c4e2 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 28 Jul 2023 13:21:23 +0800 Subject: [PATCH] * Change the doc menu style. --- lib/zin/wg/docmenu/css/v1.css | 4 +-- lib/zin/wg/docmenu/v1.php | 47 +++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/lib/zin/wg/docmenu/css/v1.css b/lib/zin/wg/docmenu/css/v1.css index e2dfc63a80..b83e2a8065 100644 --- a/lib/zin/wg/docmenu/css/v1.css +++ b/lib/zin/wg/docmenu/css/v1.css @@ -1,9 +1,9 @@ -.module-menu {max-height: calc(100vh - 105px); box-shadow: unset; padding: 0 0 8px;} +.module-menu {max-height: calc(100vh - 105px); padding: 0 0 8px;} .module-menu .active {color: var(--color-primary-600); font-weight: 500;} .module-menu header a:hover > .icon {color: var(--color-primary-600) !important;} .module-menu .tree-item * {white-space: nowrap;} -#docDropmenu {padding-bottom: 0.5rem; background-color: var(--color-gray-100);} +#docDropmenu {padding-bottom: 0.5rem;} #docDropmenu .is-leading {display: none;} #docDropmenu .primary {--tw-ring-color: var(--btn-border-color); background-color: var(--btn-bg); color: inherit; width: 100%;} diff --git a/lib/zin/wg/docmenu/v1.php b/lib/zin/wg/docmenu/v1.php index a000d7136e..f563db3ec5 100644 --- a/lib/zin/wg/docmenu/v1.php +++ b/lib/zin/wg/docmenu/v1.php @@ -368,31 +368,34 @@ class docMenu extends wg $menuLink = $this->prop('menuLink', ''); return div - ( - setClass('module-menu rounded shadow-sm bg-white col rounded-sm'), - $title && empty($menuLink) ? h::header ( - setClass('h-10 flex items-center pl-4 flex-none gap-3'), - span + $menuLink ? dropmenu ( - setClass('module-title text-lg font-semibold'), - html($title) + set::id('docDropmenu'), + set::menuID('docDropmenuMenu'), + set::text($title), + set::url($menuLink), + ) : null, + div + ( + setClass('module-menu rounded shadow-sm bg-white col rounded-sm'), + $title && empty($menuLink) ? h::header + ( + setClass('h-10 flex items-center pl-4 flex-none gap-3'), + span + ( + setClass('module-title text-lg font-semibold'), + html($title) + ), + ) : null, + h::main + ( + setClass($menuLink ? 'pt-3' : ''), + setClass('col flex-auto overflow-y-auto overflow-x-hidden pl-4 pr-1'), + zui::tree(set($this->props->pick(array('items', 'activeClass', 'activeIcon', 'activeKey', 'onClickItem', 'defaultNestedShow', 'changeActiveKey', 'isDropdownMenu', 'hover')))) + ), + $this->buildBtns() ), - ) : null, - $menuLink ? dropmenu - ( - set::id('docDropmenu'), - set::menuID('docDropmenuMenu'), - set::text($title), - set::url($menuLink), - ) : null, - h::main - ( - setClass($menuLink ? 'pt-3' : ''), - setClass('col flex-auto overflow-y-auto overflow-x-hidden pl-4 pr-1'), - zui::tree(set($this->props->pick(array('items', 'activeClass', 'activeIcon', 'activeKey', 'onClickItem', 'defaultNestedShow', 'changeActiveKey', 'isDropdownMenu', 'hover')))) - ), - $this->buildBtns() ); } }