From efddd3ddb5fc72016903ccd0b6105574d38f0f6a Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Fri, 3 Feb 2023 11:24:06 +0800 Subject: [PATCH 1/3] fix: close icon postion error --- .../src/components/enable-workspace/EnableWorkspaceModal.tsx | 3 ++- packages/app/src/ui/modal/ModalCloseButton.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx b/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx index a4552085d0..703dd5b7eb 100644 --- a/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx +++ b/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx @@ -93,7 +93,8 @@ const StyleTips = styled('div')(() => { return { userSelect: 'none', width: '400px', - marginBottom: '32px', + margin: 'auto', + marginBottom: '24px', marginTop: '16px', }; }); diff --git a/packages/app/src/ui/modal/ModalCloseButton.tsx b/packages/app/src/ui/modal/ModalCloseButton.tsx index f5e4eaf079..f3e1c40505 100644 --- a/packages/app/src/ui/modal/ModalCloseButton.tsx +++ b/packages/app/src/ui/modal/ModalCloseButton.tsx @@ -13,7 +13,7 @@ const StyledIconButton = styled(IconButton)< Pick >(({ top, right }) => { return { - position: 'absolute', + position: top ? 'absolute' : 'unset', top: top ?? 24, right: right ?? 40, }; From 32d6c07450b18842964cf101d29b98e6fd9713d8 Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Fri, 3 Feb 2023 11:47:04 +0800 Subject: [PATCH 2/3] fix: close icon postion error --- .../components/enable-workspace/EnableWorkspaceModal.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx b/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx index 703dd5b7eb..23328d7500 100644 --- a/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx +++ b/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx @@ -1,11 +1,12 @@ import { styled } from '@/styles'; import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal'; -import { Button } from '@/ui/button'; +import { Button, IconButton } from '@/ui/button'; import { useTranslation } from '@affine/i18n'; import { useAppState } from '@/providers/app-state-provider'; import { useState } from 'react'; import router from 'next/router'; import { toast } from '@/ui/toast'; +import { CloseIcon } from '@blocksuite/icons'; interface EnableWorkspaceModalProps { open: boolean; onClose: () => void; @@ -22,11 +23,13 @@ export const EnableWorkspaceModal = ({
- { onClose(); }} - /> + > + +
{t('Enable AFFiNE Cloud')}? From 61c5ddea5e5719bfdae10e0b888071f6ede4c49d Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Fri, 3 Feb 2023 11:48:23 +0800 Subject: [PATCH 3/3] fix:delete unuse icon --- .../src/components/enable-workspace/EnableWorkspaceModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx b/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx index 23328d7500..5f32ed0417 100644 --- a/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx +++ b/packages/app/src/components/enable-workspace/EnableWorkspaceModal.tsx @@ -1,5 +1,5 @@ import { styled } from '@/styles'; -import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal'; +import { Modal, ModalWrapper } from '@/ui/modal'; import { Button, IconButton } from '@/ui/button'; import { useTranslation } from '@affine/i18n'; import { useAppState } from '@/providers/app-state-provider';