diff --git a/src/editor-v2/containers/GlobalConfig/GlobalConfig.scss b/src/editor-v2/containers/GlobalConfig/GlobalConfig.scss deleted file mode 100644 index f17318cedf..0000000000 --- a/src/editor-v2/containers/GlobalConfig/GlobalConfig.scss +++ /dev/null @@ -1,12 +0,0 @@ -@import '../../styles/variables.scss'; -@import '../../styles/mixins.scss'; - -$block: '.#{$ns}global-config'; - -#{$block} { - &__title { - @include text-subheader-3; - padding: 16px 12px; - border-bottom: 1px solid var(--g-color-line-generic); - } -} diff --git a/src/editor-v2/containers/GlobalConfig/GlobalConfig.tsx b/src/editor-v2/containers/GlobalConfig/GlobalConfig.tsx index 3098c056d6..f3575adf02 100644 --- a/src/editor-v2/containers/GlobalConfig/GlobalConfig.tsx +++ b/src/editor-v2/containers/GlobalConfig/GlobalConfig.tsx @@ -1,10 +1,5 @@ import FormGenerator from '../../../form-generator-v2/FormGenerator'; import {useMainEditorStore} from '../../hooks/useMainEditorStore'; -import {editorCn} from '../../utils/cn'; - -import './GlobalConfig.scss'; - -const b = editorCn('global-config'); export interface GlobalConfigProps { className?: string; @@ -18,8 +13,7 @@ const GlobalConfig = ({className}: GlobalConfigProps) => { }; return ( -
-
Global Config
+
); diff --git a/src/editor-v2/hooks/useEditorTabs.tsx b/src/editor-v2/hooks/useEditorTabs.tsx index 534e637639..6380d5fc46 100644 --- a/src/editor-v2/hooks/useEditorTabs.tsx +++ b/src/editor-v2/hooks/useEditorTabs.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import Tabs, {TabItemProps} from '../components/Tabs/Tabs'; +import {TabItemProps} from '../components/Tabs/Tabs'; import BlockConfigForm from '../containers/BlockConfigForm/BlockConfigForm'; import BlocksList from '../containers/BlocksList/BlocksList'; import GlobalConfig from '../containers/GlobalConfig/GlobalConfig'; @@ -18,68 +18,44 @@ export const useEditorTabs = ({ () => ({ left: [ { - id: 'page', - title: 'PAGE', - component: () => ( - ( - - ), - withPadding: true, - }, - ]} - /> - ), + id: 'blocks-list', + title: 'BLOCKS', + component: BlocksList, + withPadding: true, + }, + { + id: 'layers', + title: 'LAYERS', + component: Tree, + withPadding: true, }, { id: 'global', title: 'GLOBAL', component: GlobalConfig, + withPadding: true, + }, + { + id: 'source-code', + title: 'RAW', + component: SourceCode, + withPadding: true, }, ...(leftTabs || []), ], right: [ { - id: 'edit', - title: 'EDIT', - component: () => ( - ( - - ), - withPadding: true, - }, - ]} - /> + id: 'block-config', + title: 'INPUTS', + component: BlockConfigForm, + }, + { + id: 'source-code', + title: 'RAW', + component: ({className}: {className?: string}) => ( + ), + withPadding: true, }, ...(rightTabs || []), ],