From 0ffe43d8139818e1854d7eb13e8c528e0673a216 Mon Sep 17 00:00:00 2001 From: Ozan Yurtsever Date: Mon, 27 Nov 2023 21:02:37 +0900 Subject: [PATCH] Revert "CSS namespaces" --- src/EditorComposer.css | 2 - src/EditorComposer.tsx | 4 +- src/plugins/ToolbarPlugin/ToolbarPlugin.css | 2 - src/plugins/ToolbarPlugin/ToolbarPlugin.tsx | 43 ++++++++++----------- 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/EditorComposer.css b/src/EditorComposer.css index 160b99d..c00f688 100644 --- a/src/EditorComposer.css +++ b/src/EditorComposer.css @@ -8,8 +8,6 @@ @import 'https://fonts.googleapis.com/css?family=Reenie+Beanie'; -@namespace "Verbum-EditorComposer"; - .editor-shell { margin: 20px auto; border-radius: 2px; diff --git a/src/EditorComposer.tsx b/src/EditorComposer.tsx index 331b61a..27a8037 100644 --- a/src/EditorComposer.tsx +++ b/src/EditorComposer.tsx @@ -27,9 +27,7 @@ const EditorComposer = ({ children, initialEditorState }: IEditorComposer) => { return ( - -
{children}
- +
{children}
); diff --git a/src/plugins/ToolbarPlugin/ToolbarPlugin.css b/src/plugins/ToolbarPlugin/ToolbarPlugin.css index 2d7dd8e..1d3eb15 100644 --- a/src/plugins/ToolbarPlugin/ToolbarPlugin.css +++ b/src/plugins/ToolbarPlugin/ToolbarPlugin.css @@ -6,8 +6,6 @@ * * */ -@namespace 'Verbum-toolbar'; - .ToolbarPlugin__dialogActions { display: flex; flex-direction: row; diff --git a/src/plugins/ToolbarPlugin/ToolbarPlugin.tsx b/src/plugins/ToolbarPlugin/ToolbarPlugin.tsx index 4133770..97e7a32 100644 --- a/src/plugins/ToolbarPlugin/ToolbarPlugin.tsx +++ b/src/plugins/ToolbarPlugin/ToolbarPlugin.tsx @@ -265,29 +265,26 @@ const ToolbarPlugin = ({ blockType, }} > - -
- - - - {supportedBlockTypes.has(blockType) && - activeEditor === initialEditor && ( - <> - - - - )} - {blockType === 'code' ? ( - <> - - - {alignExists && AlignComponent} - - ) : ( - <>{children} - )} -
- +
+ + + + {supportedBlockTypes.has(blockType) && activeEditor === initialEditor && ( + <> + + + + )} + {blockType === 'code' ? ( + <> + + + {alignExists && AlignComponent} + + ) : ( + <>{children} + )} +
); };