From 7303b7963b31094158fc4c94eae478acbd162aa1 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Thu, 14 Jan 2016 14:20:21 -0500 Subject: [PATCH] import `main.scss` in render.jsx Fallout from #305, fixes #324 --- src/lib/render.jsx | 2 ++ src/views/about/about.jsx | 1 - src/views/components/components.jsx | 1 - src/views/credits/credits.jsx | 1 - src/views/hoc/hoc.jsx | 1 - src/views/splash/splash.jsx | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/render.jsx b/src/lib/render.jsx index fbc737607..04791ab72 100644 --- a/src/lib/render.jsx +++ b/src/lib/render.jsx @@ -3,6 +3,8 @@ var ReactDOM = require('react-dom'); var ReactIntl = require('./intl.jsx'); var IntlProvider = ReactIntl.IntlProvider; +require('../main.scss'); + var Navigation = require('../components/navigation/navigation.jsx'); var Footer = require('../components/footer/footer.jsx'); diff --git a/src/views/about/about.jsx b/src/views/about/about.jsx index 1c9d9eac9..db688d92d 100644 --- a/src/views/about/about.jsx +++ b/src/views/about/about.jsx @@ -3,7 +3,6 @@ var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage; var FormattedMessage = require('react-intl').FormattedMessage; var render = require('../../lib/render.jsx'); -require('../../main.scss'); require('./about.scss'); var About = React.createClass({ diff --git a/src/views/components/components.jsx b/src/views/components/components.jsx index 0e8b10d0f..577216095 100644 --- a/src/views/components/components.jsx +++ b/src/views/components/components.jsx @@ -8,7 +8,6 @@ var Carousel = require('../../components/carousel/carousel.jsx'); var Input = require('../../components/forms/input.jsx'); var Spinner = require('../../components/spinner/spinner.jsx'); -require('../../main.scss'); require('./components.scss'); var Components = React.createClass({ diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 61b945c3c..88fe2fb4f 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -1,7 +1,6 @@ var React = require('react'); var render = require('../../lib/render.jsx'); -require('../../main.scss'); require('./credits.scss'); var Credits = React.createClass({ diff --git a/src/views/hoc/hoc.jsx b/src/views/hoc/hoc.jsx index ad4381cbf..3d14cc13d 100644 --- a/src/views/hoc/hoc.jsx +++ b/src/views/hoc/hoc.jsx @@ -8,7 +8,6 @@ var Button = require('../../components/forms/button.jsx'); var Box = require('../../components/box/box.jsx'); var SubNavigation = require('../../components/subnavigation/subnavigation.jsx'); -require('../../main.scss'); require('./hoc.scss'); var Hoc = React.createClass({ diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx index a6479d2de..b5088e14c 100644 --- a/src/views/splash/splash.jsx +++ b/src/views/splash/splash.jsx @@ -17,7 +17,6 @@ var Modal = require('../../components/modal/modal.jsx'); var News = require('../../components/news/news.jsx'); var Welcome = require('../../components/welcome/welcome.jsx'); -require('../../main.scss'); require('./splash.scss'); var Splash = injectIntl(React.createClass({