diff --git a/src/containers/editor/RichEditor/styles/index.ts b/src/containers/editor/RichEditor/styles/index.ts index dbfbd9c80..c1100d488 100755 --- a/src/containers/editor/RichEditor/styles/index.ts +++ b/src/containers/editor/RichEditor/styles/index.ts @@ -19,8 +19,8 @@ export const EditorWrapper = styled(EditWrapperBase).attrs(() => ({ }))` color: ${theme('thread.articleTitle')}; min-height: ${({ type }) => getMinHeight(type)}; - border-top: 1px solid; - border-top-color: #1a3a40; + border-bottom: 3px solid; + border-bottom-color: ${theme('border')}; // media therdhold is 651 width: 100%; padding-top: 10px; diff --git a/src/containers/editor/RichEditor/styles/metric.ts b/src/containers/editor/RichEditor/styles/metric.ts index 066275a63..1ebb8424a 100644 --- a/src/containers/editor/RichEditor/styles/metric.ts +++ b/src/containers/editor/RichEditor/styles/metric.ts @@ -1,7 +1,7 @@ export const getWidth = (type) => { switch (type) { case 'comment': { - return '600px' + return '620px' } default: { return '680px' diff --git a/src/containers/editor/RichEditor/styles/overwrite.ts b/src/containers/editor/RichEditor/styles/overwrite.ts index 03727dc36..98c01a2eb 100644 --- a/src/containers/editor/RichEditor/styles/overwrite.ts +++ b/src/containers/editor/RichEditor/styles/overwrite.ts @@ -16,7 +16,7 @@ const RichEditorStyle = createGlobalStyle` } .ce-paragraph[data-placeholder]:empty::before { - color: #4d666c !important; + color: #a2a2a2 !important; } .codex-editor svg { @@ -124,7 +124,7 @@ const RichEditorStyle = createGlobalStyle` } } .ce-inline-toolbar { - background: #03343F; + background: white; border: none; } .ce-settings { @@ -331,7 +331,7 @@ const RichEditorStyle = createGlobalStyle` display: none; } .tippy-tooltip.light-theme, .tippy-box[data-theme~=light]{ - background: ${theme('popover.bg')} !important; + /* background: ${theme('popover.bg')} !important; */ border: 1px solid; border-color: ${theme('popover.borderColor')} !important; box-shadow: ${theme('popover.boxShadow')} !important; diff --git a/src/containers/layout/GlobalLayout/CustomBg.tsx b/src/containers/layout/GlobalLayout/CustomBg.tsx index 0da8952d3..2b8e033b2 100644 --- a/src/containers/layout/GlobalLayout/CustomBg.tsx +++ b/src/containers/layout/GlobalLayout/CustomBg.tsx @@ -7,7 +7,7 @@ type TBackgroundEffect = | { bgImage: string bgColor?: string - bgSize?: 'contain' | 'cover' + bgSize?: 'contain' | 'cover' | 'auto' } | string @@ -53,6 +53,7 @@ const ComstomBg: FC = () => { }, tg: { bgImage: '/bg/tg-green.jpg', + bgSize: 'auto', }, tg2: { bgImage: '/bg/tg-earth.jpg', diff --git a/src/containers/layout/ThemePalette/GlobalStyle.ts b/src/containers/layout/ThemePalette/GlobalStyle.ts index 7f59bb771..97d9a184b 100755 --- a/src/containers/layout/ThemePalette/GlobalStyle.ts +++ b/src/containers/layout/ThemePalette/GlobalStyle.ts @@ -181,10 +181,13 @@ const GlobalStyle = createGlobalStyle` `}; } + .tippy-box { + background: ${theme('popover.bg')} !important; + } /** customize tooltip animation globally */ .tippy-box[data-state='visible'] { background: ${theme('popover.bg')} !important; - transition: all 0.2s ease-in-out !important; + transition: all .25s ease-in-out !important; } .tippy-box[data-placement^=top][data-state='visible'] { transform: translateY(-5px); diff --git a/src/containers/tool/Drawer/styles/index.ts b/src/containers/tool/Drawer/styles/index.ts index 5972b2cef..d511f424d 100755 --- a/src/containers/tool/Drawer/styles/index.ts +++ b/src/containers/tool/Drawer/styles/index.ts @@ -79,9 +79,9 @@ export const DrawerWrapper = styled.div.attrs( opacity: ${({ visible, fromContentEdge }) => !visible && !fromContentEdge ? 0 : 1}; - max-width: ${({ visible, fromContentEdge }) => - !visible && !fromContentEdge ? '60%' : '985px'}; - /* max-width: 985px; */ + /* max-width: ${({ visible, fromContentEdge }) => + !visible && !fromContentEdge ? '60%' : '985px'}; */ + max-width: 985px; ${({ fromContentEdge }) => fromContentEdge @@ -90,7 +90,7 @@ export const DrawerWrapper = styled.div.attrs( will-change: transform, max-width, opacity; // 在宽屏时滑出来时,是从内容页而不是实际的 window 页滑出, 加 delay 可以在视觉上抵消从外部滑入的跳动感 - transition-delay: 0s, 0s, 0.1s; + transition-delay: 0s, 0s, 0.06s; ${css.media.mobile` right: 0; diff --git a/src/containers/unit/Comments/Editor/PublishEditor.tsx b/src/containers/unit/Comments/Editor/PublishEditor.tsx index 387f4b5fc..c33d495bc 100644 --- a/src/containers/unit/Comments/Editor/PublishEditor.tsx +++ b/src/containers/unit/Comments/Editor/PublishEditor.tsx @@ -1,45 +1,35 @@ import { FC, memo } from 'react' -import type { TAccount, TSubmitState } from '@/spec' +import type { TSubmitState } from '@/spec' -import Header from './Header' +// import Header from './Header' import BodyEditor from './BodyEditor' -import Footer from './Footer' -import { Wrapper, ExpandWrapper } from '../styles/editor/publish_editor' -import { commentOnChange, createComment, closeEditor } from '../logic' +import { Wrapper } from '../styles/editor/publish_editor' +// import { commentOnChange, createComment, closeEditor } from '../logic' +import { commentOnChange } from '../logic' type TProps = { - accountInfo: TAccount body: string submitState: TSubmitState - showEditor: boolean } -const PublishEditor: FC = ({ - accountInfo, - submitState, - showEditor, - body, -}) => { - if (!showEditor) { - return - } +const PublishEditor: FC = ({ submitState, body }) => { return ( - -
+ + {/*
*/} commentOnChange(v, 'commentBody')} /> -