1 files changed, 23 insertions, 6 deletions
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index 21b135c49..a6b28f488 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -4,8 +4,9 @@
 
 .mainView-tabButtons {
     position: relative;
-    width:100%;
+    width: 100%;
 }
+
 // add nodes menu. Note that the + button is actually an input label, not an actual button.
 .mainView-docButtons {
     position: absolute;
@@ -22,21 +23,31 @@
     overflow: auto;
     z-index: 1;
 }
+
 .mainView-mainContent {
-    width:100%;
-    height:100%;
-    position:absolute;
+    width: 100%;
+    height: 100%;
+    position: absolute;
 }
-.mainView-flyoutContainer{
-    display:flex;
+
+.mainView-flyoutContainer {
+    display: flex;
     flex-direction: column;
     position: absolute;
+<<<<<<< HEAD
+    width: 100%;
+    height: 100%;
+    border: black 1px solid;
+
+=======
     width:100%;
     height:100%;
+>>>>>>> 33811c112c7e479813908ba10f72813954a3e289
     .documentView-node-topmost {
         background: lightgrey;
     }
 }
+
 .mainView-mainDiv {
     width: 100%;
     height: 100%;
@@ -62,8 +73,13 @@
 
 .mainView-expandFlyoutButton {
     position: absolute;
+<<<<<<< HEAD
+    top: 100px;
+    right: 30px;
+=======
     top: 5px;
     right: 5px;
+>>>>>>> 33811c112c7e479813908ba10f72813954a3e289
     cursor: pointer;
 }
 
@@ -75,6 +91,7 @@
     border-radius: 5px;
     position: absolute;
     z-index: 1;
+    touch-action: none;
 }
 
 .mainView-workspace {