zahmis 5 лет назад
Родитель
Сommit
66a22928aa
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      src/client/js/app.jsx
  2. 2 2
      src/client/styles/scss/_mixins.scss

+ 2 - 2
src/client/js/app.jsx

@@ -8,7 +8,7 @@ import loggerFactory from '@alias/logger';
 import ErrorBoundary from './components/ErrorBoudary';
 import ErrorBoundary from './components/ErrorBoudary';
 import SearchPage from './components/SearchPage';
 import SearchPage from './components/SearchPage';
 import TagsList from './components/TagsList';
 import TagsList from './components/TagsList';
-// import PageEditor from './components/PageEditor';
+import PageEditor from './components/PageEditor';
 import DisplaySwitcher from './components/Page/DisplaySwitcher';
 import DisplaySwitcher from './components/Page/DisplaySwitcher';
 import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
 import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
 import { defaultEditorOptions, defaultPreviewOptions } from './components/PageEditor/OptionsSelector';
 import { defaultEditorOptions, defaultPreviewOptions } from './components/PageEditor/OptionsSelector';
@@ -111,7 +111,7 @@ if (pageContainer.state.path != null) {
 // additional definitions if user is logged in
 // additional definitions if user is logged in
 if (appContainer.currentUser != null) {
 if (appContainer.currentUser != null) {
   Object.assign(componentMappings, {
   Object.assign(componentMappings, {
-    // 'page-editor': <PageEditor />,
+    'page-editor': <PageEditor />,
     'display-switcher': <DisplaySwitcher />,
     'display-switcher': <DisplaySwitcher />,
     'editor-navbar-bottom': <EditorNavbarBottom />,
     'editor-navbar-bottom': <EditorNavbarBottom />,
 
 

+ 2 - 2
src/client/styles/scss/_mixins.scss

@@ -37,8 +37,8 @@
       flex: 1;
       flex: 1;
       flex-direction: column;
       flex-direction: column;
 
 
-      #edit,
-      #hackmd {
+      .tab-pane#edit,
+      .tab-pane#hackmd {
         height: calc(100vh - #{$header-plus-footer} + 17px);
         height: calc(100vh - #{$header-plus-footer} + 17px);
         min-height: calc(100vh - #{$header-plus-footer} + 17px); // for IE11
         min-height: calc(100vh - #{$header-plus-footer} + 17px); // for IE11
       }
       }