fix: bad style of done button

localization/locales/en/translation.json

@@ -56,7 +56,8 @@
     "SwitchCreateNewOrOpenExisted": "Switch to create a new or open an existing WIKI",
     "MainWorkspace": "Main Workspace",
     "SubWorkspace": "Sub Workspace",
-    "WorkspaceFolder": "Parent Folder to place workspace",
+    "WorkspaceFolder": "Location of workspace's folder",
+    "WorkspaceParentFolder": "Parent Folder of workspace's folder",
     "Choose": "Choose",
     "MainWorkspaceLocation": "Path of main workspace",
     "SubWorkspaceWillLinkTo": "Sub-Workspace will link to",

localization/locales/zh_CN/translation.json

@@ -66,7 +66,8 @@
     "LocalWorkspace": "本地知识库",
     "SyncedWorkspaceDescription": "同步到在线存储服务（例如Github），需要你登录存储服务或输入登录凭证，并有良好的网络连接。可以跨设备同步数据，在使用了值得信任的存储服务的情况下，数据仍归你所有。而且文件夹被不慎删除后，还可以从在线服务重新下载数据到本地。",
     "LocalWorkspaceDescription": "仅在本地使用，完全掌控自己的数据。太记仍然会为你创建一个本地的 git 备份系统，让你可以回退到之前的版本，但当文件夹被删除时所有内容还是会丢失。",
-    "WorkspaceFolder": "知识库所在的的文件夹",
+    "WorkspaceFolder": "工作区文件夹的位置",
+    "WorkspaceParentFolder": "文件夹所在的父文件夹",
     "Choose": "选择",
     "WikiServerPort": "WIKI服务器端口号（出现冲突再改，一般默认即可）",
     "MainWorkspaceLocation": "主知识库位置",

src/pages/AddWorkspace/CloneWikiDoneButton.tsx

@@ -9,6 +9,7 @@ import Alert from '@material-ui/lab/Alert';
 import type { IWikiWorkspaceFormProps } from './useForm';
 import { useValidateCloneWiki, useCloneWiki } from './useCloneWiki';
 import { useWikiCreationProgress } from './useIndicator';
+import { WikiLocation } from './FormComponents';
 
 const CloseButton = styled(Button)`
   white-space: nowrap;
@@ -39,18 +40,14 @@ export function CloneWikiDoneButton({ form, isCreateMainWorkspace }: IWikiWorksp
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.CloneWiki')}
           </Typography>
-          <Typography variant="body2" noWrap display="inline" align="center" style={{ direction: 'rtl', textTransform: 'none' }}>
-            {form.wikiFolderLocation}
-          </Typography>
+          <WikiLocation>{form.wikiFolderLocation}</WikiLocation>
         </CloseButton>
       ) : (
         <CloseButton variant="contained" color="secondary" onClick={onSubmit}>
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.CloneWiki')}
           </Typography>
-          <Typography variant="body2" noWrap display="inline" align="center" style={{ direction: 'rtl', textTransform: 'none' }}>
-            {form.wikiFolderLocation}
-          </Typography>
+          <WikiLocation>{form.wikiFolderLocation}</WikiLocation>
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.AndLinkToMainWorkspace')}
           </Typography>

src/pages/AddWorkspace/CloneWikiForm.tsx

@@ -25,7 +25,7 @@ export function CloneWikiForm({ form, isCreateMainWorkspace }: IWikiWorkspaceFor
         <LocationPickerInput
           error={errorInWhichComponent.parentFolderLocation}
           onChange={(event) => form.parentFolderLocationSetter(event.target.value)}
-          label={t('AddWorkspace.WorkspaceFolder')}
+          label={t('AddWorkspace.WorkspaceParentFolder')}
           value={form.parentFolderLocation}
         />
         <LocationPickerButton

src/pages/AddWorkspace/ExistedWikiDoneButton.tsx

@@ -8,6 +8,7 @@ import Alert from '@material-ui/lab/Alert';
 import type { IWikiWorkspaceFormProps } from './useForm';
 import { useValidateExistedWiki, useExistedWiki } from './useExistedWiki';
 import { useWikiCreationProgress } from './useIndicator';
+import { WikiLocation } from './FormComponents';
 
 const CloseButton = styled(Button)`
   white-space: nowrap;
@@ -46,18 +47,14 @@ export function ExistedWikiDoneButton({
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.ImportWiki')}
           </Typography>
-          <Typography variant="body2" noWrap display="inline" align="center" style={{ direction: 'rtl', textTransform: 'none' }}>
-            {form.existedWikiFolderPath}
-          </Typography>
+          <WikiLocation>{form.existedWikiFolderPath}</WikiLocation>
         </CloseButton>
       ) : (
         <CloseButton variant="contained" color="secondary" onClick={onSubmit}>
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.ImportWiki')}
           </Typography>
-          <Typography variant="body2" noWrap display="inline" align="center" style={{ direction: 'rtl', textTransform: 'none' }}>
-            {form.existedWikiFolderPath}
-          </Typography>
+          <WikiLocation>{form.existedWikiFolderPath}</WikiLocation>
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.AndLinkToMainWorkspace')}
           </Typography>

src/pages/AddWorkspace/ExistedWikiForm.tsx

@@ -32,7 +32,7 @@ export function ExistedWikiForm({
             form.existedWikiFolderPathSetter(event.target.value);
           }}
           label={t('AddWorkspace.WorkspaceFolder')}
-          helperText={`${t('AddWorkspace.ImportWiki')}${form.wikiFolderLocation}`}
+          helperText={`${t('AddWorkspace.ImportWiki')}${form.existedWikiFolderPath}`}
           value={form.existedWikiFolderPath}
         />
         <LocationPickerButton

src/pages/AddWorkspace/FormComponents.tsx

@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import { Paper, Button, TextField, Autocomplete } from '@material-ui/core';
+import { Paper, Button, TextField, Autocomplete, Typography } from '@material-ui/core';
 
 export const CreateContainer = styled(Paper)`
   padding: 10px;
@@ -30,3 +30,10 @@ export const SubWikiTagAutoComplete = styled(Autocomplete)``;
 SubWikiTagAutoComplete.defaultProps = {
   freeSolo: true,
 };
+export const WikiLocation = styled(Typography)`
+  direction: rtl;
+  text-transform: none;
+  margin-left: 5px;
+  margin-right: 5px;
+`;
+WikiLocation.defaultProps = { variant: 'body2', noWrap: true, display: 'inline', align: 'center' };

src/pages/AddWorkspace/NewWikiDoneButton.tsx

@@ -9,6 +9,7 @@ import Alert from '@material-ui/lab/Alert';
 import type { IWikiWorkspaceFormProps } from './useForm';
 import { useValidateNewWiki, useNewWiki } from './useNewWiki';
 import { useWikiCreationProgress } from './useIndicator';
+import { WikiLocation } from './FormComponents';
 
 const CloseButton = styled(Button)`
   white-space: nowrap;
@@ -43,18 +44,14 @@ export function NewWikiDoneButton({
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.CreateWiki')}
           </Typography>
-          <Typography variant="body2" noWrap display="inline" align="center" style={{ direction: 'rtl', textTransform: 'none' }}>
-            {form.wikiFolderLocation}
-          </Typography>
+          <WikiLocation>{form.wikiFolderLocation}</WikiLocation>
         </CloseButton>
       ) : (
         <CloseButton variant="contained" color="secondary" onClick={onSubmit}>
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.CreateWiki')}
           </Typography>
-          <Typography variant="body2" noWrap display="inline" align="center" style={{ direction: 'rtl', textTransform: 'none', marginLeft: 5, marginRight: 5 }}>
-            {form.wikiFolderLocation}
-          </Typography>
+          <WikiLocation>{form.wikiFolderLocation}</WikiLocation>
           <Typography variant="body1" display="inline">
             {t('AddWorkspace.AndLinkToMainWorkspace')}
           </Typography>

src/pages/AddWorkspace/NewWikiForm.tsx

@@ -29,7 +29,7 @@ export function NewWikiForm({
         <LocationPickerInput
           error={errorInWhichComponent.parentFolderLocation}
           onChange={(event) => form.parentFolderLocationSetter(event.target.value)}
-          label={t('AddWorkspace.WorkspaceFolder')}
+          label={t('AddWorkspace.WorkspaceParentFolder')}
           value={form.parentFolderLocation}
         />
         <LocationPickerButton