Merge branch 'master' into icons

This commit is contained in:
Tom Moor
2017-09-04 12:39:04 -07:00
4 changed files with 6 additions and 5 deletions

View File

@@ -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>