more wip
This commit is contained in:
@@ -80,7 +80,7 @@ class App extends Component {
|
||||
<FullscreenLayout>
|
||||
<Navbar toggleTheme={this.onChangeTheme} />
|
||||
<RouteLayout>
|
||||
<Router style={{ flex: 1 }}>
|
||||
<Router>
|
||||
<PrivateRoute
|
||||
authed={authed}
|
||||
path="/app/:year"
|
||||
|
||||
@@ -4,16 +4,24 @@ import { Global, css } from "@emotion/core"
|
||||
import styled from "@emotion/styled"
|
||||
|
||||
import { SimpleNavbar } from "../Navbar"
|
||||
import { withTheme } from "emotion-theming"
|
||||
|
||||
export default ({ children }) => (
|
||||
const Layout = ({ children, theme }) => (
|
||||
<>
|
||||
<Helmet title="Sol Journal" />
|
||||
<Global
|
||||
styles={css`
|
||||
* {
|
||||
transition: 0.2s border-color ease-in-out, 0.2s fill ease-in-out,
|
||||
/* transition: 0.2s border-color ease-in-out, 0.2s fill ease-in-out,
|
||||
0.2s box-shadow ease-in-out, 0.2s background-color ease-in-out,
|
||||
0.2s color ease-in-out;
|
||||
0.2s color ease-in-out; */
|
||||
overflow: -moz-scrollbars-none;
|
||||
}
|
||||
*::-webkit-scrollbar {
|
||||
width: 0 !important;
|
||||
}
|
||||
html {
|
||||
background-color: ${theme.colors.bodyBackground};
|
||||
}
|
||||
h1 {
|
||||
font-family: "Montserrat", -apple-system, BlinkMacSystemFont,
|
||||
@@ -23,6 +31,7 @@ export default ({ children }) => (
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
min-height: 100vh;
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
|
||||
"Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
|
||||
"Helvetica Neue", sans-serif;
|
||||
@@ -34,3 +43,5 @@ export default ({ children }) => (
|
||||
{children}
|
||||
</>
|
||||
)
|
||||
|
||||
export default withTheme(Layout)
|
||||
|
||||
@@ -62,7 +62,7 @@ const JournalEntryArea = styled.textarea`
|
||||
background-color: transparent;
|
||||
line-height: 1.5;
|
||||
letter-spacing: 0.5px;
|
||||
height: calc(100vh - 275px);
|
||||
height: calc(100vh - 300px);
|
||||
width: 100%;
|
||||
border: none;
|
||||
resize: none;
|
||||
|
||||
BIN
src/img/splash.png
Normal file
BIN
src/img/splash.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Reference in New Issue
Block a user