Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-web
Commits
d26d2804
Commit
d26d2804
authored
Oct 02, 2017
by
Andrew Hrdy
Browse files
Reverted to not using theme.js file. (Fixed unknown issue in some package).
parent
59ea1fad
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/containers/FacilityCard.js
View file @
d26d2804
...
...
@@ -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
'
}
...
...
src/index.js
View file @
d26d2804
...
...
@@ -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
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment