diff --git a/.DS_Store b/.DS_Store
index 2e6d09f..df2b77f 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/client/src/App.js b/client/src/App.js
index 75f12c4..38b8463 100755
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -18,6 +18,7 @@ import {black, white} from './utils'
// Components
// Layout
import Navbar from "./components/layout/Navbar";
+import Sidebar from './components/layout/Sidebar'
import Homepage from "./components/homepage/Homepage";
import Footer from "./components/layout/Footer";
@@ -48,7 +49,7 @@ class App extends Component {
- Navigation
+
@@ -78,12 +79,11 @@ const AppWrapper = styled.div`
const ContentWrapper = styled.div`
display: flex;
- margin-top: 30rem;
`;
-const SidebarWrapper = styled.div`
+const SidebarWrapper = styled.nav`
background-color: ${black};
- flex: 0 0 18%;
+ flex: 0 0 15%;
color: ${white};
`;
diff --git a/client/src/components/layout/Navbar.js b/client/src/components/layout/Navbar.js
index 6d77b6d..8ec3f4b 100644
--- a/client/src/components/layout/Navbar.js
+++ b/client/src/components/layout/Navbar.js
@@ -2,7 +2,7 @@ import React, {Component} from "react";
import {Link} from "react-router-dom";
import {connect} from "react-redux";
import styled from 'styled-components'
-import {darken, lighten} from 'polished'
+import {darken} from 'polished'
// REDUX ACTIONS
import {logoutUser} from "../../actions/authActions";
@@ -143,9 +143,9 @@ const NavbarStyled = styled.header`
}
}
- &__input:focus + &__button {
+ /* &__input:focus + &__button {
background-color: red;
- }
+ } */
&__button {
border: none;
diff --git a/client/src/components/layout/Sidebar.js b/client/src/components/layout/Sidebar.js
new file mode 100644
index 0000000..5506a8f
--- /dev/null
+++ b/client/src/components/layout/Sidebar.js
@@ -0,0 +1,38 @@
+import React from 'react';
+import {Link} from 'react-router-dom'
+
+// ASSETS
+import sprites from '../../img/sprite.svg'
+
+const Sidebar = () => {
+ return (
+
+ -
+
+
+ Home
+
+
+ -
+
+
+ Tags
+
+
+ -
+
+
+ Users
+
+
+
+ );
+}
+
+export default Sidebar;
\ No newline at end of file
diff --git a/client/src/elements/Buttons.js b/client/src/elements/Buttons.js
index 15eaf0c..c31671f 100644
--- a/client/src/elements/Buttons.js
+++ b/client/src/elements/Buttons.js
@@ -22,7 +22,7 @@ export const Button = styled.button`
`;
const SignUpButton = styled(Button)`
- background: ${secondary};
+ background: ${primary};
&:hover {
background: ${darken(0.2, primary)};
diff --git a/client/src/img/sprite.svg b/client/src/img/sprite.svg
index 371f8ba..5f20239 100755
--- a/client/src/img/sprite.svg
+++ b/client/src/img/sprite.svg
@@ -1,8 +1,36 @@
diff --git a/client/src/utils/Colors.js b/client/src/utils/Colors.js
index 72a75b9..d977f4e 100644
--- a/client/src/utils/Colors.js
+++ b/client/src/utils/Colors.js
@@ -1,5 +1,5 @@
export const primary = '#5EC5B6'
-export const secondary = '#85DAEF'
+export const secondary = '#54C0E4'
export const secondary_light = '#8EEEEF'
export const black = '#242729'