Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
7303b796
Commit
7303b796
authored
Jan 14, 2016
by
Matthew Taylor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
import `main.scss` in render.jsx
Fallout from #305, fixes #324
parent
dddc867c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
5 deletions
+2
-5
src/lib/render.jsx
src/lib/render.jsx
+2
-0
src/views/about/about.jsx
src/views/about/about.jsx
+0
-1
src/views/components/components.jsx
src/views/components/components.jsx
+0
-1
src/views/credits/credits.jsx
src/views/credits/credits.jsx
+0
-1
src/views/hoc/hoc.jsx
src/views/hoc/hoc.jsx
+0
-1
src/views/splash/splash.jsx
src/views/splash/splash.jsx
+0
-1
No files found.
src/lib/render.jsx
View file @
7303b796
...
...
@@ -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
'
);
...
...
src/views/about/about.jsx
View file @
7303b796
...
...
@@ -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
({
...
...
src/views/components/components.jsx
View file @
7303b796
...
...
@@ -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
({
...
...
src/views/credits/credits.jsx
View file @
7303b796
var
React
=
require
(
'
react
'
);
var
render
=
require
(
'
../../lib/render.jsx
'
);
require
(
'
../../main.scss
'
);
require
(
'
./credits.scss
'
);
var
Credits
=
React
.
createClass
({
...
...
src/views/hoc/hoc.jsx
View file @
7303b796
...
...
@@ -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
({
...
...
src/views/splash/splash.jsx
View file @
7303b796
...
...
@@ -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
({
...
...
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