zahmis 5 лет назад
Родитель
Сommit
c1d3440dce

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

@@ -106,8 +106,6 @@ if (pageContainer.state.path != null) {
 if (appContainer.currentUser != null) {
   Object.assign(componentMappings, {
     'display-switcher': <DisplaySwitcher />,
-    // 'editor-navbar-bottom': <EditorNavbarBottom />,
-
   });
 }
 

+ 0 - 1
src/client/js/components/Navbar/ThreeStrandedButton.jsx

@@ -47,7 +47,6 @@ const ThreeStrandedButton = (props) => {
         <i className="icon-note icon-fw" />
         { t('Edit') }
       </button>
-
       <button
         type="button"
         className="btn btn-outline-primary hackmd-button"

+ 4 - 7
src/client/js/components/Page/DisplaySwitcher.jsx

@@ -7,6 +7,7 @@ import Editor from '../PageEditor';
 import Page from '../Page';
 import PageEditorByHackmd from '../PageEditorByHackmd';
 import EditorNavbarBottom from '../PageEditor/EditorNavbarBottom';
+// import TableOfContents from '../TableOfContents';
 
 
 const DisplaySwitcher = (props) => {
@@ -20,17 +21,13 @@ const DisplaySwitcher = (props) => {
           <Page />
         </TabPane>
         <TabPane tabId="edit">
-          <div id="page-editor" className="page-editor-preview-container page-editor-preview-body">
-            <Editor />
-          </div>
+          <Editor />
         </TabPane>
         <TabPane tabId="hackmd">
-          <div className="hackmd-preinit hackmd-error">
-            <PageEditorByHackmd />
-          </div>
+          <PageEditorByHackmd />
         </TabPane>
       </TabContent>
-      {/* <EditorNavbarBottom /> */}
+      <EditorNavbarBottom />
     </>
   );
 };

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

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