Merge pull request #1461 from openlattice/develop

Release 2021-09-24

Author: solomontang

src/drawer/src/components/__snapshots__/Drawer.test.js.snap

@@ -283,45 +283,25 @@ exports[`Drawer snapshots isOpen = true 1`] = `
               </div>
             }
           >
-            <LockToggle
-              accountForScrollbars={true}
-              isActive={true}
-            >
-              <SheetProvider
-                accountForScrollbars={true}
-                isActive={true}
+            <TouchScrollable>
+              <OverlayOuterContainer
+                transparent={false}
               >
-                <TouchProvider
-                  accountForScrollbars={true}
-                  isActive={true}
+                <div
+                  className="c0"
                 >
-                  <ScrollLock
-                    accountForScrollbars={true}
-                    isActive={true}
+                  <OverlayInnerContainer
+                    isScrollable={true}
+                    onClick={[Function]}
                   >
-                    <TouchScrollable>
-                      <OverlayOuterContainer
-                        transparent={false}
-                      >
-                        <div
-                          className="c0"
-                        >
-                          <OverlayInnerContainer
-                            isScrollable={true}
-                            onClick={[Function]}
-                          >
-                            <div
-                              className="c1"
-                              onClick={[Function]}
-                            />
-                          </OverlayInnerContainer>
-                        </div>
-                      </OverlayOuterContainer>
-                    </TouchScrollable>
-                  </ScrollLock>
-                </TouchProvider>
-              </SheetProvider>
-            </LockToggle>
+                    <div
+                      className="c1"
+                      onClick={[Function]}
+                    />
+                  </OverlayInnerContainer>
+                </div>
+              </OverlayOuterContainer>
+            </TouchScrollable>
           </Portal>
         </Portal>
       </Transition>

src/layout/src/components/App/styled/NavigationWrapper.js

@@ -19,7 +19,7 @@ const NavigationWrapper = styled.nav`
   > a {
     align-items: center;
     border-bottom: 3px solid transparent;
-    color: ${NEUTRAL.N500};
+    color: ${NEUTRAL.N600};
     display: flex;
     font-size: 12px;
     font-weight: normal;
@@ -42,7 +42,7 @@ const NavigationWrapper = styled.nav`
     }
 
     &:hover {
-      border-bottom: 3px solid ${NEUTRAL.N500};
+      border-bottom: 3px solid ${NEUTRAL.N600};
       color: ${NEUTRAL.N700};
       cursor: pointer;
     }