Commit 26cb6c6f authored by Andrew Hrdy's avatar Andrew Hrdy
Browse files

Roboto is now correctly included. -apple-system added as a fallback font.

parent 1ca09c91
This diff is collapsed.
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<link rel="manifest" href="%PUBLIC_URL%/manifest.json"> <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.png"> <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.png">
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.40.1/mapbox-gl.css' rel='stylesheet'/> <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.40.1/mapbox-gl.css' rel='stylesheet'/>
</head> </head>
<body> <body>
......
...@@ -12,6 +12,7 @@ import reducers from './reducers/index'; ...@@ -12,6 +12,7 @@ import reducers from './reducers/index';
import {MuiThemeProvider} from 'material-ui/styles'; import {MuiThemeProvider} from 'material-ui/styles';
import theme from './theme'; import theme from './theme';
import './styles/build/whatsOpen.css'; import './styles/build/whatsOpen.css';
import 'typeface-roboto';
// Create a history of your choosing (we're using a browser history in this case) // Create a history of your choosing (we're using a browser history in this case)
const history = createHistory(); const history = createHistory();
......
...@@ -172,7 +172,7 @@ const theme = createMuiTheme({ ...@@ -172,7 +172,7 @@ const theme = createMuiTheme({
} }
}, },
typography: { typography: {
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
fontSize: 14, fontSize: 14,
fontWeightLight: 300, fontWeightLight: 300,
fontWeightRegular: 400, fontWeightRegular: 400,
...@@ -180,7 +180,7 @@ const theme = createMuiTheme({ ...@@ -180,7 +180,7 @@ const theme = createMuiTheme({
display4: { display4: {
fontSize: 112, fontSize: 112,
fontWeight: 300, fontWeight: 300,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
letterSpacing: '-.04em', letterSpacing: '-.04em',
lineHeight: 1, lineHeight: 1,
color: 'rgba(0, 0, 0, 0.54)' color: 'rgba(0, 0, 0, 0.54)'
...@@ -188,7 +188,7 @@ const theme = createMuiTheme({ ...@@ -188,7 +188,7 @@ const theme = createMuiTheme({
display3: { display3: {
fontSize: 56, fontSize: 56,
fontWeight: 400, fontWeight: 400,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
letterSpacing: '-.02em', letterSpacing: '-.02em',
lineHeight: 1.35, lineHeight: 1.35,
color: 'rgba(0, 0, 0, 0.54)' color: 'rgba(0, 0, 0, 0.54)'
...@@ -196,56 +196,56 @@ const theme = createMuiTheme({ ...@@ -196,56 +196,56 @@ const theme = createMuiTheme({
display2: { display2: {
fontSize: 45, fontSize: 45,
fontWeight: 400, fontWeight: 400,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '48px', lineHeight: '48px',
color: 'rgba(0, 0, 0, 0.54)' color: 'rgba(0, 0, 0, 0.54)'
}, },
display1: { display1: {
fontSize: 34, fontSize: 34,
fontWeight: 400, fontWeight: 400,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '40px', lineHeight: '40px',
color: 'rgba(0, 0, 0, 0.54)' color: 'rgba(0, 0, 0, 0.54)'
}, },
headline: { headline: {
fontSize: 24, fontSize: 24,
fontWeight: 400, fontWeight: 400,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '32px', lineHeight: '32px',
color: 'rgba(0, 0, 0, 0.87)' color: 'rgba(0, 0, 0, 0.87)'
}, },
title: { title: {
fontSize: 21, fontSize: 21,
fontWeight: 500, fontWeight: 500,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: 1, lineHeight: 1,
color: 'rgba(0, 0, 0, 0.87)' color: 'rgba(0, 0, 0, 0.87)'
}, },
subheading: { subheading: {
fontSize: 16, fontSize: 16,
fontWeight: 400, fontWeight: 400,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '24px', lineHeight: '24px',
color: 'rgba(0, 0, 0, 0.87)' color: 'rgba(0, 0, 0, 0.87)'
}, },
body2: { body2: {
fontSize: 14, fontSize: 14,
fontWeight: 500, fontWeight: 500,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '24px', lineHeight: '24px',
color: 'rgba(0, 0, 0, 0.87)' color: 'rgba(0, 0, 0, 0.87)'
}, },
body1: { body1: {
fontSize: 14, fontSize: 14,
fontWeight: 400, fontWeight: 400,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '20px', lineHeight: '20px',
color: 'rgba(0, 0, 0, 0.87)' color: 'rgba(0, 0, 0, 0.87)'
}, },
caption: { caption: {
fontSize: 12, fontSize: 12,
fontWeight: 400, fontWeight: 400,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif', fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: 1, lineHeight: 1,
color: 'rgba(0, 0, 0, 0.54)' color: 'rgba(0, 0, 0, 0.54)'
}, },
...@@ -253,7 +253,7 @@ const theme = createMuiTheme({ ...@@ -253,7 +253,7 @@ const theme = createMuiTheme({
fontSize: 14, fontSize: 14,
textTransform: 'uppercase', textTransform: 'uppercase',
fontWeight: 500, fontWeight: 500,
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif' fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif'
} }
}, },
mixins: { mixins: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment