scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #326 from mewtaylor/issue/324-dropdown-hidden

Browse source 
Fix GH-324: import `main.scss` in render.jsx
This commit is contained in:
Matthew Taylor 2016-01-14 22:25:17 -05:00
commit 923186d533
6 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/render.jsx
View file

@ -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');

1
src/views/about/about.jsx
View file

@ -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({

1
src/views/components/components.jsx
View file

@ -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({

1
src/views/credits/credits.jsx
View file

@ -1,7 +1,6 @@
var React = require('react');
var render = require('../../lib/render.jsx');
require('../../main.scss');
require('./credits.scss');
var Credits = React.createClass({

1
src/views/hoc/hoc.jsx
View file

@ -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({

1
src/views/splash/splash.jsx
View file

@ -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({