Merge pull request #152 from ipfs/styles

refactor: Improve style setup
ipfs · Jan 1, 2016 · 485a978 · 485a978
2 parents 9cd87b3 + 179d9f2
commit 485a978
Show file tree

Hide file tree

Showing 10 changed files with 1,332 additions and 413 deletions.
diff --git a/app/scripts/main.js → app/scripts/app.js b/app/scripts/main.js → app/scripts/app.js
@@ -3,6 +3,8 @@ import ReactDOM from 'react-dom'
 import Router from 'react-router'
 import routes from './routes'
 
+require('../styles/app.less')
+
 if (process.env.NODE_ENV !== 'production') {
   window.uiDebug = require('debug')
 }

diff --git a/app/scripts/routes.js b/app/scripts/routes.js
@@ -12,8 +12,6 @@ import ConfigPage from './pages/config'
 import LogPage from './pages/logs'
 import NotFoundPage from './pages/notfound'
 
-require('../styles/bundle.less')
-
 export default (
   <Route handler={Page} path='/'>
     <DefaultRoute name='home' handler={HomePage} />

diff --git a/app/scripts/views/config.js b/app/scripts/views/config.js
@@ -11,7 +11,7 @@ export default React.createClass({
 
   getInitialState: function () {
     return {
-      body: JSON.stringify(this.props.config, null, '\t'),
+      body: JSON.stringify(this.props.config, null, '  '),
       error: null,
       saving: false,
       saved: false
@@ -20,7 +20,7 @@ export default React.createClass({
 
   reset: function () {
     this.setState({
-      body: JSON.stringify(this.props.config, null, '\t'),
+      body: JSON.stringify(this.props.config, null, '  '),
       error: null
     })
   },

diff --git a/app/styles/app.less b/app/styles/app.less
@@ -0,0 +1,6 @@
+@import "./variables";
+@import "./bootstrap";
+@import "../../node_modules/font-awesome/less/font-awesome";
+
+@import "./base";
+@import "./typography";