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

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

@@ -9,7 +9,6 @@ import ErrorBoundary from './components/ErrorBoudary';
 import SearchPage from './components/SearchPage';
 import TagsList from './components/TagsList';
 import DisplaySwitcher from './components/Page/DisplaySwitcher';
-import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
 import { defaultEditorOptions, defaultPreviewOptions } from './components/PageEditor/OptionsSelector';
 import Page from './components/Page';
 import PageComments from './components/PageComments';
@@ -107,7 +106,7 @@ if (pageContainer.state.path != null) {
 if (appContainer.currentUser != null) {
   Object.assign(componentMappings, {
     'display-switcher': <DisplaySwitcher />,
-    'editor-navbar-bottom': <EditorNavbarBottom />,
+    // 'editor-navbar-bottom': <EditorNavbarBottom />,
 
   });
 }

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

@@ -15,7 +15,7 @@
   }
 }
 
-@mixin expand-editor($editor-header-plus-footer, $navbar-height-adjustment: 96px) {
+@mixin expand-editor($editor-header-plus-footer, $navbar-height-adjustment: 0px) {
   $navbar-height: $grw-navbar-border-width + $navbar-height-adjustment;
   $header-plus-footer: $navbar-height + $editor-header-plus-footer + 2px; // add .main padding-top
 
@@ -39,8 +39,8 @@
 
       .tab-pane#edit,
       .tab-pane#hackmd {
-        height: calc(100vh - #{$header-plus-footer} + 17px);
-        min-height: calc(100vh - #{$header-plus-footer} + 17px); // for IE11
+        height: calc(100vh - #{$header-plus-footer});
+        min-height: calc(100vh - #{$header-plus-footer}); // for IE11
       }
 
       #page-editor {
@@ -49,14 +49,14 @@
         & > .row,
         .page-editor-preview-container,
         .page-editor-preview-body {
-          height: calc(100vh - #{$header-plus-footer} +19px);
-          min-height: calc(100vh - #{$header-plus-footer} + 19px); // for IE11
+          height: calc(100vh - #{$header-plus-footer});
+          min-height: calc(100vh - #{$header-plus-footer}); // for IE11
         }
 
         // left(editor)
         .page-editor-editor-container {
-          height: calc(100vh - #{$header-plus-footer} +19px);
-          min-height: calc(100vh - #{$header-plus-footer} +19px); // for IE11
+          height: calc(100vh - #{$header-plus-footer});
+          min-height: calc(100vh - #{$header-plus-footer}); // for IE11
 
           .react-codemirror2,
           .CodeMirror,
@@ -73,8 +73,8 @@
         .hackmd-error,
         #iframe-hackmd-container > iframe {
           width: 100%;
-          height: calc(100vh - #{$header-plus-footer} + 33px);
-          min-height: calc(100vh - #{$header-plus-footer} + 33px); // for IE11
+          height: calc(100vh - #{$header-plus-footer});
+          min-height: calc(100vh - #{$header-plus-footer}); // for IE11
         }
       }
     }