Merge branch 'moreUpgrading' into dataViz-annotations

1 files changed, 2 insertions, 19 deletions

diff --git a/src/client/views/collections/CollectionDockingView.scss b/src/client/views/collections/CollectionDockingView.scss
index 333ba9f32..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;
@@ -276,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;
@@ -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;