Merge branch 'parker' of https://github.com/brown-dash/Dash-Web into parker

1 files changed, 20 insertions, 19 deletions

diff --git a/src/client/views/collections/CollectionDockingView.scss b/src/client/views/collections/CollectionDockingView.scss
index b2ee33807..091ba8e74 100644
--- a/src/client/views/collections/CollectionDockingView.scss
+++ b/src/client/views/collections/CollectionDockingView.scss
@@ -1,5 +1,6 @@
-@import "../global/globalCssVariables.scss";
-
+@import '../global/globalCssVariables.scss';
+@import '../../../../node_modules/golden-layout/src/css/goldenlayout-base.css';
+@import '../../../../node_modules/golden-layout/src/css/goldenlayout-dark-theme.css';
 
 .lm_title {
     -webkit-appearance: none;
@@ -36,11 +37,11 @@
 }
 
 .lm_header .lm_tab {
-    padding: 0px;
-    opacity: 0.7;
-    box-shadow: none;
-    height: 24px;
-    // border-bottom: 1px black;
+    // padding: 0px;  // moved to MainView.scss, othwerise they get overridden by default stylings
+    // opacity: 0.7;
+    // box-shadow: none;
+    // height: 25px;
+    // border-bottom: black solid;
 
     .collectionDockingView-gear {
         display: none;
@@ -153,7 +154,7 @@
         background: $white;
     }
 
-    .lm_controls>li {
+    .lm_controls > li {
         opacity: 1;
         transform: scale(1);
     }
@@ -196,7 +197,7 @@
         position: absolute;
         cursor: move;
         border: 2px solid #cfe8ff;
-        box-shadow: inset 0 0 60px rgba(0, 0, 0, .2);
+        box-shadow: inset 0 0 60px rgba(0, 0, 0, 0.2);
         border-radius: 5px;
         z-index: 1000;
         box-sizing: border-box;
@@ -205,7 +206,7 @@
     .flexlayout__outline_rect_edge {
         cursor: move;
         border: 2px solid #b7d1b5;
-        box-shadow: inset 0 0 60px rgba(0, 0, 0, .2);
+        box-shadow: inset 0 0 60px rgba(0, 0, 0, 0.2);
         border-radius: 5px;
         z-index: 1000;
         box-sizing: border-box;
@@ -214,7 +215,7 @@
     .flexlayout__edge_rect {
         position: absolute;
         z-index: 1000;
-        box-shadow: inset 0 0 5px rgba(0, 0, 0, .2);
+        box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
         background-color: lightgray;
     }
 
@@ -222,7 +223,7 @@
         position: absolute;
         cursor: move;
         border: 2px solid #aaaaaa;
-        box-shadow: inset 0 0 60px rgba(0, 0, 0, .3);
+        box-shadow: inset 0 0 60px rgba(0, 0, 0, 0.3);
         border-radius: 5px;
         z-index: 1000;
         box-sizing: border-box;
@@ -301,7 +302,7 @@
 
     .flexlayout__tab_button:hover .flexlayout__tab_button_trailing,
     .flexlayout__tab_button--selected .flexlayout__tab_button_trailing {
-        background: transparent url("../../../../node_modules/flexlayout-react/images/close_white.png") no-repeat center;
+        background: transparent url('../../../../node_modules/flexlayout-react/images/close_white.png') no-repeat center;
     }
 
     .flexlayout__tab_button_overflow {
@@ -314,7 +315,7 @@
         font-size: 10px;
         color: lightgray;
         font-family: Arial, sans-serif;
-        background: transparent url("../../../../node_modules/flexlayout-react/images/more.png") no-repeat left;
+        background: transparent url('../../../../node_modules/flexlayout-react/images/more.png') no-repeat left;
     }
 
     .flexlayout__tabset_header {
@@ -369,7 +370,7 @@
         height: 20px;
         border: none;
         outline-width: 0;
-        background: transparent url("../../../../node_modules/flexlayout-react/images/maximize.png") no-repeat center;
+        background: transparent url('../../../../node_modules/flexlayout-react/images/maximize.png') no-repeat center;
     }
 
     .flexlayout__tab_toolbar_button-max {
@@ -377,7 +378,7 @@
         height: 20px;
         border: none;
         outline-width: 0;
-        background: transparent url("../../../../node_modules/flexlayout-react/images/restore.png") no-repeat center;
+        background: transparent url('../../../../node_modules/flexlayout-react/images/restore.png') no-repeat center;
     }
 
     .flexlayout__popup_menu_item {
@@ -390,7 +391,7 @@
     }
 
     .flexlayout__popup_menu_container {
-        box-shadow: inset 0 0 5px rgba(0, 0, 0, .15);
+        box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.15);
         border: 1px solid #555;
         background: #222;
         border-radius: 3px;
@@ -497,7 +498,7 @@
 
     .flexlayout__border_button:hover .flexlayout__border_button_trailing,
     .flexlayout__border_button--selected .flexlayout__border_button_trailing {
-        background: transparent url("../../../../node_modules/flexlayout-react/images/close_white.png") no-repeat center;
+        background: transparent url('../../../../node_modules/flexlayout-react/images/close_white.png') no-repeat center;
     }
 
     .flexlayout__border_toolbar_left {
@@ -539,4 +540,4 @@
         bottom: 0;
         right: 0;
     }
-}
\ No newline at end of file
+}