mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-27 01:25:52 -05:00
Merge pull request #326 from mewtaylor/issue/324-dropdown-hidden
Fix GH-324: import `main.scss` in render.jsx
This commit is contained in:
commit
923186d533
6 changed files with 2 additions and 5 deletions
|
@ -3,6 +3,8 @@ var ReactDOM = require('react-dom');
|
||||||
var ReactIntl = require('./intl.jsx');
|
var ReactIntl = require('./intl.jsx');
|
||||||
var IntlProvider = ReactIntl.IntlProvider;
|
var IntlProvider = ReactIntl.IntlProvider;
|
||||||
|
|
||||||
|
require('../main.scss');
|
||||||
|
|
||||||
var Navigation = require('../components/navigation/navigation.jsx');
|
var Navigation = require('../components/navigation/navigation.jsx');
|
||||||
var Footer = require('../components/footer/footer.jsx');
|
var Footer = require('../components/footer/footer.jsx');
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
|
||||||
var FormattedMessage = require('react-intl').FormattedMessage;
|
var FormattedMessage = require('react-intl').FormattedMessage;
|
||||||
var render = require('../../lib/render.jsx');
|
var render = require('../../lib/render.jsx');
|
||||||
|
|
||||||
require('../../main.scss');
|
|
||||||
require('./about.scss');
|
require('./about.scss');
|
||||||
|
|
||||||
var About = React.createClass({
|
var About = React.createClass({
|
||||||
|
|
|
@ -8,7 +8,6 @@ var Carousel = require('../../components/carousel/carousel.jsx');
|
||||||
var Input = require('../../components/forms/input.jsx');
|
var Input = require('../../components/forms/input.jsx');
|
||||||
var Spinner = require('../../components/spinner/spinner.jsx');
|
var Spinner = require('../../components/spinner/spinner.jsx');
|
||||||
|
|
||||||
require('../../main.scss');
|
|
||||||
require('./components.scss');
|
require('./components.scss');
|
||||||
|
|
||||||
var Components = React.createClass({
|
var Components = React.createClass({
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
var React = require('react');
|
var React = require('react');
|
||||||
var render = require('../../lib/render.jsx');
|
var render = require('../../lib/render.jsx');
|
||||||
|
|
||||||
require('../../main.scss');
|
|
||||||
require('./credits.scss');
|
require('./credits.scss');
|
||||||
|
|
||||||
var Credits = React.createClass({
|
var Credits = React.createClass({
|
||||||
|
|
|
@ -8,7 +8,6 @@ var Button = require('../../components/forms/button.jsx');
|
||||||
var Box = require('../../components/box/box.jsx');
|
var Box = require('../../components/box/box.jsx');
|
||||||
var SubNavigation = require('../../components/subnavigation/subnavigation.jsx');
|
var SubNavigation = require('../../components/subnavigation/subnavigation.jsx');
|
||||||
|
|
||||||
require('../../main.scss');
|
|
||||||
require('./hoc.scss');
|
require('./hoc.scss');
|
||||||
|
|
||||||
var Hoc = React.createClass({
|
var Hoc = React.createClass({
|
||||||
|
|
|
@ -17,7 +17,6 @@ var Modal = require('../../components/modal/modal.jsx');
|
||||||
var News = require('../../components/news/news.jsx');
|
var News = require('../../components/news/news.jsx');
|
||||||
var Welcome = require('../../components/welcome/welcome.jsx');
|
var Welcome = require('../../components/welcome/welcome.jsx');
|
||||||
|
|
||||||
require('../../main.scss');
|
|
||||||
require('./splash.scss');
|
require('./splash.scss');
|
||||||
|
|
||||||
var Splash = injectIntl(React.createClass({
|
var Splash = injectIntl(React.createClass({
|
||||||
|
|
Loading…
Reference in a new issue