Commit d26d2804 authored by Andrew Hrdy's avatar Andrew Hrdy
Browse files

Reverted to not using theme.js file. (Fixed unknown issue in some package).

parent 59ea1fad
......@@ -126,7 +126,7 @@ const FacilityCard = ({classes, facility, favorites, addFavoriteFacility, remove
<CardContent className={classes.cardContent}>
<Grid container align={'center'} direction={'column'} className={classes.smallGridContainerSpacing}>
<Grid item className={classes.smallGridItemSpacing}>
<Typography type={'title'} align={'center'} className={classes.nunito}>
<Typography type={'title'} align={'center'} className={classes.title}>
{removeBrackets(facility.facility_name)}
</Typography>
</Grid>
......@@ -236,6 +236,10 @@ const styleSheet = {
alignItems: 'center',
maxWidth: '50%'
},
title: {
fontFamily: 'Nunito',
fontWeight: 'bold',
},
nunito: {
fontFamily: 'Nunito'
}
......
......@@ -10,7 +10,6 @@ import { Provider } from 'react-redux';
import ReduxThunk from 'redux-thunk';
import reducers from './reducers/index';
import { MuiThemeProvider,createMuiTheme,createPalette } from 'material-ui/styles';
import theme from './theme';
import blue from 'material-ui/colors/blue';
// import fullWhite from 'material-ui/colors/common';
// import grey from 'material-ui/colors/grey';
......@@ -34,10 +33,15 @@ if(extension) {
const store = createStore(reducers,enhance);
const theme = createMuiTheme({
palette: {primary:blue,secondary:green,warn:amber,error:red,type:'light'}
});
ReactDOM.render(
<Provider store={store}>
<ConnectedRouter history={history}>
<MuiThemeProvider theme={createMuiTheme(theme)}>
<MuiThemeProvider theme={theme}>
<Layout />
</MuiThemeProvider>
</ConnectedRouter>
......
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