Force vertical scrollbar in workspace.

This is related to #216.
openskope · Jul 18, 2018 · 3bba9ad · 3bba9ad
1 parent d39e570
commit 3bba9ad
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 46 deletions.
diff --git a/meteor-app/imports/ui/pages/dynamic-workspace/index.less b/meteor-app/imports/ui/pages/dynamic-workspace/index.less
@@ -7,13 +7,21 @@
 
   .two-column-layout() {
     .flex-row;
+    width: 100%;
+    height: 100%;
 
     & > .left {
       width: 50%;
       max-width: 600px;
+
+      overflow-x: hidden;
+      overflow-y: scroll;
     }
     & > .right {
       .layout-fill;
+
+      overflow-x: hidden;
+      overflow-y: scroll;
     }
 
     & > .full {
@@ -30,8 +38,6 @@
   }
   .markdown-container() {
     padding: 15px;
-    overflow-x: hidden;
-    overflow-y: auto;
   }
 
   & > .suite-wrapper {

diff --git a/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/analytics/style.less b/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/analytics/style.less
@@ -1,8 +1,5 @@
 .dataset__analytics-tab {
-  .two-column-layout;
-
-  width: 100%;
-  height: 100%;
+  .two-column-layout();
 
   & > .analytics__controls {
     .two-column-layout > .left;
@@ -17,14 +14,4 @@
     grid-area: toolbar;
     z-index: 1;
   }
-
-  .analytics__controls {
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-
-  .analytics__charts {
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
 }
diff --git a/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/download/style.less b/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/download/style.less
@@ -1,8 +1,5 @@
 .dataset__download-tab {
-  .two-column-layout;
-
-  width: 100%;
-  height: 100%;
+  .two-column-layout();
 
   & > .download__controls {
     .two-column-layout > .left;
@@ -11,11 +8,6 @@
   & > .download__markdown {
     .two-column-layout > .right;
     .two-column-layout > .bottom-layer;
-    .markdown-container;
-  }
-
-  .download__controls {
-    overflow-x: hidden;
-    overflow-y: auto;
+    .markdown-container();
   }
 }
diff --git a/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/info/style.less b/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/info/style.less
@@ -1,16 +1,15 @@
 .dataset__info-tab {
   .two-column-layout();
 
-  width: 100%;
-  height: 100%;
-
   & > .info__markdown {
     .two-column-layout > .left;
     .two-column-layout > .top-layer;
-    .markdown-container;
+    .markdown-container();
   }
   & > .info__map {
     .two-column-layout > .right;
     .two-column-layout > .bottom-layer;
+
+    overflow: hidden;
   }
 }
diff --git a/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/metadata/style.less b/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/metadata/style.less
@@ -1,11 +1,8 @@
 .dataset__metadata-tab {
-  .two-column-layout;
-
-  width: 100%;
-  height: 100%;
+  .two-column-layout();
 
   & > .metadata__markdown {
     .two-column-layout > .full;
-    .markdown-container;
+    .markdown-container();
   }
 }
diff --git a/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/model/style.less b/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/model/style.less
@@ -1,11 +1,8 @@
 .dataset__model-tab {
-  .two-column-layout;
-
-  width: 100%;
-  height: 100%;
+  .two-column-layout();
 
   & > .model__markdown {
     .two-column-layout > .full;
-    .markdown-container;
+    .markdown-container();
   }
 }
diff --git a/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/overlay/style.less b/meteor-app/imports/ui/pages/dynamic-workspace/suites/dataset/tabs/overlay/style.less
@@ -1,8 +1,5 @@
 .dataset__overlay-tab {
-  .two-column-layout;
-
-  width: 100%;
-  height: 100%;
+  .two-column-layout();
 
   & > .overlay__controls {
     .two-column-layout > .left;
@@ -15,8 +12,6 @@
 
   .overlay__controls {
     .flex-col;
-    overflow-x: hidden;
-    overflow-y: auto;
 
     .map-and-toolbar {
       padding: 10px;
@@ -25,9 +20,11 @@
 
   .overlay__map {
     .flex-col;
+    overflow-y: auto;
 
     & > .mapview {
       .layout-fill;
+      min-height: 300px;
     }
   }
 }