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

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

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