From adce12e212f21afa9543ddd875db06e10dcae7bc Mon Sep 17 00:00:00 2001 From: panda Date: Thu, 24 Mar 2022 00:43:02 +0800 Subject: [PATCH] ui: fix nav-dropdown (#326) --- packages/ui-default/components/dropdown/Dropdown.js | 2 +- packages/ui-default/components/dropdown/dropdown.page.styl | 3 ++- packages/ui-default/templates/partials/nav.html | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/ui-default/components/dropdown/Dropdown.js b/packages/ui-default/components/dropdown/Dropdown.js index 036a6439a..8aa0e81d3 100644 --- a/packages/ui-default/components/dropdown/Dropdown.js +++ b/packages/ui-default/components/dropdown/Dropdown.js @@ -26,7 +26,7 @@ export default class Dropdown extends DOMAttachedObject { }; this.dropInstance = new Drop({ target: $dom[0], - classes: 'dropdown', + classes: `dropdown ${$dom.attr('data-dropdown-custom-class') || ''}`, content: this.options.target || $.find($dom.attr('data-dropdown-target'))[0], position: this.options.position, openOn: 'hover', diff --git a/packages/ui-default/components/dropdown/dropdown.page.styl b/packages/ui-default/components/dropdown/dropdown.page.styl index 15c6577f0..03ecb8ad3 100644 --- a/packages/ui-default/components/dropdown/dropdown.page.styl +++ b/packages/ui-default/components/dropdown/dropdown.page.styl @@ -4,9 +4,10 @@ .drop .dropdown-target display: block -.dropdown +.drop.nav__dropdown max-height: calc(100% - 60px) overflow-y: auto + box-shadow: 0rem 0.125rem 0.4375rem rgba(0 0 0 , 30%); .dropdown .menu diff --git a/packages/ui-default/templates/partials/nav.html b/packages/ui-default/templates/partials/nav.html index 020eb7477..ee98e15bb 100644 --- a/packages/ui-default/templates/partials/nav.html +++ b/packages/ui-default/templates/partials/nav.html @@ -18,7 +18,7 @@ {% if not handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} - {% else %} -