Merge branch 'master' into sophie-ai-images

1 files changed, 12 insertions, 29 deletions

diff --git a/src/client/views/collections/CollectionDockingView.scss b/src/client/views/collections/CollectionDockingView.scss
index c0530ab81..a747ef45f 100644
--- a/src/client/views/collections/CollectionDockingView.scss
+++ b/src/client/views/collections/CollectionDockingView.scss
@@ -1,4 +1,4 @@
-@import '../global/globalCssVariables.scss';
+@import '../global/globalCssVariables.module.scss';
 
 .lm_root {
     position: relative;
@@ -28,10 +28,6 @@
     position: relative;
     z-index: 20;
 }
-.lm_splitter:hover,
-.lm_splitter.lm_dragging {
-    background: orange;
-}
 .lm_splitter.lm_vertical .lm_drag_handle {
     width: 100%;
     position: absolute;
@@ -56,7 +52,7 @@
 // }
 .lm_header .lm_controls {
     position: absolute;
-    right: 3px;
+    right: 0px;
 }
 .lm_header .lm_controls > li {
     cursor: pointer;
@@ -64,16 +60,12 @@
     width: 18px;
     height: 18px;
     text-align: center;
-    top: 3px;
 }
 .lm_header ul {
     margin: 0;
     padding: 0;
     list-style-type: none;
 }
-.lm_header .lm_tabs {
-    position: absolute;
-}
 .lm_header .lm_tab {
     cursor: pointer;
     float: left;
@@ -280,7 +272,7 @@
     z-index: 20;
 } /*# sourceMappingURL=goldenlayout-base.css.map */
 
-@import '../../../../node_modules/golden-layout/src/css/goldenlayout-dark-theme.css';
+@import './goldenLayoutTheme.css';
 
 .lm_title {
     -webkit-appearance: none;
@@ -329,8 +321,9 @@
 }
 
 .lm_header .lm_tabs {
+    position: absolute;
     overflow-y: hidden;
-    width: 100%;
+    width: calc(100% - 5px);
 }
 ul.lm_tabs::before {
     content: ' ';
@@ -484,8 +477,6 @@ ul.lm_tabs::before {
 .collectiondockingview-container {
     width: 100%;
     height: 100%;
-    border-style: solid;
-    border-width: $COLLECTION_BORDER_WIDTH;
     position: absolute;
     top: 0;
     left: 0;
@@ -508,6 +499,7 @@ ul.lm_tabs::before {
         display: flex;
         align-content: center;
         justify-content: center;
+        background: transparent !important;
     }
 
     .lm_controls > li {
@@ -518,7 +510,11 @@ ul.lm_tabs::before {
 
     .lm_controls .lm_popout {
         background-image: unset;
-        left: -3;
+        border-top-left-radius: 10px;
+        border-bottom-left-radius: 10px;
+        background: #93939347;
+        z-index: 100;
+        //left: -3;
         &:hover {
             background: gray;
             color: white !important;
@@ -528,7 +524,7 @@ ul.lm_tabs::before {
         content: '+';
         margin: auto;
         font-size: x-large;
-        top: -6;
+        top: -4;
         position: relative;
     }
     .lm_maximise {
@@ -681,11 +677,6 @@ ul.lm_tabs::before {
         height: 8px;
     }
 
-    .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;
-    }
-
     .flexlayout__tab_button_overflow {
         float: left;
         width: 20px;
@@ -696,7 +687,6 @@ ul.lm_tabs::before {
         font-size: 10px;
         color: lightgray;
         font-family: Arial, sans-serif;
-        background: transparent url('../../../../node_modules/flexlayout-react/images/more.png') no-repeat left;
     }
 
     .flexlayout__tabset_header {
@@ -751,7 +741,6 @@ ul.lm_tabs::before {
         height: 20px;
         border: none;
         outline-width: 0;
-        background: transparent url('../../../../node_modules/flexlayout-react/images/maximize.png') no-repeat center;
     }
 
     .flexlayout__tab_toolbar_button-max {
@@ -759,7 +748,6 @@ ul.lm_tabs::before {
         height: 20px;
         border: none;
         outline-width: 0;
-        background: transparent url('../../../../node_modules/flexlayout-react/images/restore.png') no-repeat center;
     }
 
     .flexlayout__popup_menu_item {
@@ -877,11 +865,6 @@ ul.lm_tabs::before {
         height: 8px;
     }
 
-    .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;
-    }
-
     .flexlayout__border_toolbar_left {
         position: absolute;
         display: flex;