Merge branch 'rebranding' into new-landing-page

jmprathab · Feb 21, 2021 · 8b7b124 · 8b7b124
2 parents 5ac4883 + 481219b
commit 8b7b124
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "@fortawesome/react-fontawesome": "^0.1.11",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.0.4",
-    "@testing-library/user-event": "^12.1.5",
+    "@testing-library/user-event": "^12.1.6",
     "@wojtekmaj/react-daterange-picker": "^3.0.1",
     "axios": "^0.20.0",
     "bootstrap": "^4.5.2",

diff --git a/src/components/sidebar/Sidebar.jsx b/src/components/sidebar/Sidebar.jsx
@@ -44,18 +44,17 @@ const Bar = styled.div`
   padding: 20px 10px 20px 0;
   border-right: 3px solid ${styles.colors.grey};
 
-  left: -100%;
   display: initial;
   z-index: 2;
   height: ${styles.variables.viewHeight};
   background-color: ${styles.colors.white};
 
   @media screen and (max-width: 600px) {
     position: absolute;
-    transition: left .5s;
+    display: none;
 
     ${props => props.overlay && css`
-      left: 0;
+      display: initial;
     `}
   }
 `;

diff --git a/src/pages/sign-in-and-sign-up/SignUp.jsx b/src/pages/sign-in-and-sign-up/SignUp.jsx
@@ -140,7 +140,7 @@ class SignUp extends Component {
         }
         footer={
           <Text type="paragraph" textAlign="center">
-            Already have an account? <Link to="/signup">Log In</Link>
+            Already have an account? <Link to="/login">Log In</Link>
           </Text>
         }
       />