diff --git a/src/App.js b/src/App.js index cf70fb5..3116d1d 100644 --- a/src/App.js +++ b/src/App.js @@ -15,6 +15,9 @@ import Register from "./components/screens/Register"; import { withAuthentication } from "./components/session"; const RouteLayout = styled.div` + display: flex; + flex-direction: column; + height: 100%; margin: 0 auto; padding: 0 10px; max-width: 720px; diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js index 7565ef3..7b88a26 100644 --- a/src/components/Navbar/Navbar.js +++ b/src/components/Navbar/Navbar.js @@ -6,6 +6,7 @@ import { withTheme } from "emotion-theming"; import { todayUrl, yearUrl } from "../../utils/date"; +import Logo from "../Logo"; import Icon from "../Icon"; import { withAuthentication } from "../session"; @@ -29,10 +30,13 @@ const Nav = styled.div` justify-content: space-between; align-content: center; `; -const Logo = styled.div``; +const LogoSection = styled.div` + width: 40px; +`; const NavIcons = styled.div` display: flex; flex-direction: row; + align-items: center; * + * { margin-left: 10px; } @@ -41,12 +45,16 @@ const NavIcons = styled.div` const Navbar = ({ authUser, theme, toggleTheme }) => (