From 2bc64c504a3f82e8ec6acaeb2dacc0d714b5b18b Mon Sep 17 00:00:00 2001 From: wjh Date: Thu, 19 Sep 2024 22:21:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A2=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E9=97=B4=E8=B7=9D=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?=20(#1548)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachybase/pulls/1548 Reviewed-by: sealday Co-authored-by: wjh Co-committed-by: wjh --- .../src/built-in/pinned-list/PinnedPluginListProvider.tsx | 2 +- .../core/client/src/schema-component/antd/menu/Menu.tsx | 2 +- packages/core/client/src/user/CurrentUser.tsx | 6 +++--- .../plugin-core/src/client/components/system/MobileLink.tsx | 2 +- .../src/client/components/system/Notifications.tsx | 2 +- .../src/client/components/system/OnlineUserProvider.tsx | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/core/client/src/built-in/pinned-list/PinnedPluginListProvider.tsx b/packages/core/client/src/built-in/pinned-list/PinnedPluginListProvider.tsx index 542d00669..b114cfe89 100644 --- a/packages/core/client/src/built-in/pinned-list/PinnedPluginListProvider.tsx +++ b/packages/core/client/src/built-in/pinned-list/PinnedPluginListProvider.tsx @@ -23,7 +23,7 @@ const useStyles = createStyles(({ css }) => { display: inline-block; .ant-btn { border: 0; - height: 46px; + height: var(--tb-header-height); width: 46px; border-radius: 0; background: none; diff --git a/packages/core/client/src/schema-component/antd/menu/Menu.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.tsx index 32852c8d6..dcb80c5e5 100644 --- a/packages/core/client/src/schema-component/antd/menu/Menu.tsx +++ b/packages/core/client/src/schema-component/antd/menu/Menu.tsx @@ -112,7 +112,7 @@ const HeaderMenu = ({ className={css` .iconButton { border: 0; - height: 46px; + height: var(--tb-header-height); width: 46px; border-radius: 0; background: none; diff --git a/packages/core/client/src/user/CurrentUser.tsx b/packages/core/client/src/user/CurrentUser.tsx index b2e72ae16..dc7dc1fa9 100644 --- a/packages/core/client/src/user/CurrentUser.tsx +++ b/packages/core/client/src/user/CurrentUser.tsx @@ -172,7 +172,7 @@ const useStyles = createStyles(({ css, token }) => { display: inline-block; vertical-align: top; width: 46px; - height: 46px; + height: var(--tb-header-height); &:hover { background: rgba(255, 255, 255, 0.1) !important; } @@ -181,11 +181,11 @@ const useStyles = createStyles(({ css, token }) => { max-width: 160px; overflow: hidden; display: inline-block; - line-height: 12px; + line-height: var(--tb-header-height); white-space: nowrap; text-overflow: ellipsis; cursor: pointer; - padding: 16px; + padding: 0 16px 16px 16px; color: ${token.colorTextHeaderMenu}; `, }; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/system/MobileLink.tsx b/packages/plugins/@hera/plugin-core/src/client/components/system/MobileLink.tsx index 8ea7ef62d..adc261f2d 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/system/MobileLink.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/system/MobileLink.tsx @@ -13,7 +13,7 @@ export const MobileLink = () => { className={css` .ant-btn { border: 0; - height: 46px; + height: var(--tb-header-height); width: 46px; border-radius: 0; background: none; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx b/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx index afa908298..2d805ee45 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx @@ -69,7 +69,7 @@ export const Notifications = () => { className={css` .ant-btn { border: 0; - height: 46px; + height: var(--tb-header-height); width: 46px; border-radius: 0; background: none; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx b/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx index d2763097a..7093857ba 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx @@ -51,7 +51,7 @@ export const OnlineUserDropdown = () => { className={css` .ant-btn { border: 0; - height: 46px; + height: var(--tb-header-height); width: 46px; border-radius: 0; background: none;