aboutsummaryrefslogtreecommitdiff
path: root/src/index.tsx
diff options
context:
space:
mode:
authorilyayudovin <46264063+ilyayudovin@users.noreply.github.com>2020-06-07 20:20:21 +0300
committerGitHub <noreply@github.com>2020-06-07 20:20:21 +0300
commit98442762c1bbdf4e4aff317ca8ec660b6817418f (patch)
treeff56c75b023fa166781275adfd65ea917d275968 /src/index.tsx
parent5ff3d0a3a29ebba9c42603369bb16d7419a423d1 (diff)
parentb8b848dfd6e3843c6b455c8344320dcd187b72da (diff)
downloadwhich-ui-98442762c1bbdf4e4aff317ca8ec660b6817418f.tar.gz
Merge branch 'master' into feed
Diffstat (limited to 'src/index.tsx')
-rw-r--r--src/index.tsx7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/index.tsx b/src/index.tsx
index 9811de2..775c514 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -13,10 +13,6 @@ const theme = createMuiTheme({
palette: {
primary: {
main: teal[700]
- },
- text: {
- primary: '#000000',
- secondary: 'rgba(255, 255, 255, 0.6)'
}
}
});
@@ -64,8 +60,9 @@ const App: React.FC = () => {
return (
<ThemeProvider theme={theme}>
<CssBaseline />
- <Header page={page} setPage={setPage} />
+ <Header setPage={setPage} />
<Feed polls={polls} />
+ <h1> We are on page {page}! </h1>
</ThemeProvider>
);
};