Merge branch 'master' into icons

2017-09-04 12:39:04 -07:00
parent 3c9f69d495 740e79b1a4
commit b9693c5dcf
4 changed files with 6 additions and 5 deletions
--- a/frontend/components/Layout/components/HeaderBlock.js
+++ b/frontend/components/Layout/components/HeaderBlock.js
@@ -14,7 +14,7 @@ type Props = {
 function HeaderBlock({ user, team, children }: Props) {
  return (
    <Header justify="space-between" align="center">
-      <Flex align="center" column>
+      <Flex align="flex-start" column>
        <TeamName>{team.name}</TeamName>
        <UserName>{user.name}</UserName>
      </Flex>
--- a/frontend/styles/base.scss
+++ b/frontend/styles/base.scss
@@ -16,6 +16,7 @@

 html, body, .viewport {
  width: 100%;
+  min-height: 100vh;
  margin: 0;
 }