From 56f10bbf50deaec5671336c0d180c7671cdac096 Mon Sep 17 00:00:00 2001 From: QiShaoXuan Date: Mon, 6 Feb 2023 16:55:54 +0800 Subject: [PATCH] fix: refactor login button, fixed #793 --- .../src/components/workspace-modal/Footer.tsx | 16 +++++--- .../src/components/workspace-modal/styles.ts | 41 ++++++++----------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/packages/app/src/components/workspace-modal/Footer.tsx b/packages/app/src/components/workspace-modal/Footer.tsx index 6517af5cfe..9a591e197c 100644 --- a/packages/app/src/components/workspace-modal/Footer.tsx +++ b/packages/app/src/components/workspace-modal/Footer.tsx @@ -3,7 +3,7 @@ import { FlexWrapper } from '@/ui/layout'; import { WorkspaceAvatar } from '@/components/workspace-avatar'; import { IconButton } from '@/ui/button'; import { useAppState } from '@/providers/app-state-provider'; -import { StyledFooter, StyleUserInfo, StyleSignIn } from './styles'; +import { StyledFooter, StyleUserInfo, StyledSignInButton } from './styles'; import { useTranslation } from '@affine/i18n'; import { Tooltip } from '@/ui/tooltip'; export const Footer = ({ @@ -44,16 +44,20 @@ export const Footer = ({ )} {!user && ( - + + + } onClick={async () => { onLogin(); }} > - - - {t('Sign in')} - + )} ); diff --git a/packages/app/src/components/workspace-modal/styles.ts b/packages/app/src/components/workspace-modal/styles.ts index 6796c3a57b..3c48b5e062 100644 --- a/packages/app/src/components/workspace-modal/styles.ts +++ b/packages/app/src/components/workspace-modal/styles.ts @@ -1,4 +1,5 @@ -import { displayFlex, styled } from '@/styles'; +import { displayFlex, displayInlineFlex, styled } from '@/styles'; +import { Button } from '@/ui/button'; export const StyledSplitLine = styled.div(({ theme }) => { return { @@ -80,28 +81,6 @@ export const StyleUserInfo = styled.div(({ theme }) => { }; }); -export const StyleSignIn = styled.div(({ theme }) => { - return { - cursor: 'pointer', - fontSize: '16px', - fontWeight: 700, - color: theme.colors.iconColor, - span: { - display: 'inline-block', - width: '40px', - height: '40px', - borderRadius: '40px', - backgroundColor: theme.colors.innerHoverBackground, - textAlign: 'center', - lineHeight: '44px', - marginRight: '16px', - svg: { - fill: theme.colors.primaryColor, - }, - }, - }; -}); - export const StyledModalHeaderLeft = styled.div(() => { return { ...displayFlex('flex-start', 'center') }; }); @@ -160,3 +139,19 @@ export const StyledModalHeader = styled('div')(({ theme }) => { ...displayFlex('space-between', 'center'), }; }); + +export const StyledSignInButton = styled(Button)(({ theme }) => { + return { + fontWeight: 700, + paddingLeft: 0, + '.circle': { + width: '40px', + height: '40px', + borderRadius: '20px', + backgroundColor: theme.colors.innerHoverBackground, + flexShrink: 0, + marginRight: '16px', + ...displayInlineFlex('center', 'center'), + }, + }; +});