merge conflicts and toggle sidebar

1 files changed, 22 insertions, 0 deletions

diff --git a/src/client/views/nodes/MapBox/MapBox.scss b/src/client/views/nodes/MapBox/MapBox.scss
index 4fae8d8ff..f275bed54 100644
--- a/src/client/views/nodes/MapBox/MapBox.scss
+++ b/src/client/views/nodes/MapBox/MapBox.scss
@@ -1,3 +1,4 @@
+@import "../../global/globalCssVariables.scss";
 .mapBox {
         width: 100%;
         height: 100%;
@@ -7,6 +8,27 @@
             position: unset !important; // when the sidebar filter flys out, this prevents the map from extending outside the document box
         }
 
+        .mapBox-overlayButton-sidebar {
+            background: #121721;
+            height: 25px;
+            width: 25px;
+            right: 5px;
+            display: flex;
+            position: absolute;
+            align-items: center;
+            justify-content: center;
+            border-radius: 3px;
+            pointer-events: all;
+            z-index: 1; // so it appears on top of the document's title, if shown
+    
+            box-shadow: $standard-box-shadow;
+            transition: 0.2s;
+    
+            &:hover{
+                filter: brightness(0.85);
+            }
+        }
+
         .mapBox-wrapper {
             width: 100%;
             .searchbox {