vitalif
/
react-toolbox
1
0
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

Merge pull request #26 from ideal-react/dev 

add sass sourcemap in dev & add app_bar to spec & fix lint
old
Javi Velasco 2015-11-01 16:39:59 +01:00
parent 61b8a7077d 8ed0fc18c3
commit 460f1ad517
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/app/index.jsx
View File

@ -8,7 +8,7 @@ const App = (props) => {
} }
return ( return (
<div className={className}> <div className={className} data-react-toolbox='app'>
{props.children} {props.children}
</div> </div>
); );

2
components/app_bar/index.jsx
View File

@ -8,7 +8,7 @@ const AppBar = (props) => {
if (props.flat) className += ` ${style.flat}`; if (props.flat) className += ` ${style.flat}`;
return ( return (
<header className={className}> <header className={className} data-react-toolbox='app-bar'>
{props.children} {props.children}
</header> </header>
); );

4
docs/webpack.config.development.js
View File

@ -5,7 +5,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
module.exports = { module.exports = {
context: __dirname, context: __dirname,
devtool: '#eval-source-map', devtool: 'inline-source-map',
entry: [ entry: [
'webpack-hot-middleware/client', 'webpack-hot-middleware/client',
'./app/index.jsx' './app/index.jsx'
@ -35,7 +35,7 @@ module.exports = {
loader: 'babel' loader: 'babel'
}, { }, {
test: /(\.scss|\.css)$/, test: /(\.scss|\.css)$/,
loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass') loader: ExtractTextPlugin.extract('style', 'css?sourceMap&modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass?sourceMap')
}, { }, {
test: /(\.txt)$/, test: /(\.txt)$/,
loader: 'raw', loader: 'raw',

7
spec/root.jsx
View File

@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import App from '../components/app'; import App from '../components/app';
import AppBar from '../components/app_bar';
import Autocomplete from './components/autocomplete'; import Autocomplete from './components/autocomplete';
import Button from './components/button'; import Button from './components/button';
import Card from './components/card'; import Card from './components/card';
@ -22,8 +23,10 @@ import style from './style';
const Root = () => ( const Root = () => (
<App className={style.app}> <App className={style.app}>
<h1>React Toolbox</h1> <AppBar fixed flat className={style['app-bar']}>
<h3>Component Spec v0.10.20</h3> <h1>React Toolbox</h1>
<span>Component Spec v0.10.20</span>
</AppBar>
<Autocomplete /> <Autocomplete />
<Button /> <Button />

10
spec/style.scss
View File

@ -1,5 +1,5 @@
.app { .app {
padding: 1.6rem; padding: 5.5rem 1.6rem;
> h1, > h3 { > h1, > h3 {
line-height: 100%; line-height: 100%;
} }
@ -14,3 +14,11 @@
margin: 1.6rem 1.6rem 0 0; margin: 1.6rem 1.6rem 0 0;
} }
} }
.app-bar {
padding: 1.6rem;
justify-content: center;
> span {
margin-left: 1rem;
}
}

4
webpack.config.development.js
View File

@ -5,7 +5,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
module.exports = { module.exports = {
context: __dirname, context: __dirname,
devtool: '#eval-source-map', devtool: 'inline-source-map',
entry: [ entry: [
'webpack-hot-middleware/client', 'webpack-hot-middleware/client',
'./spec/index.jsx' './spec/index.jsx'
@ -26,7 +26,7 @@ module.exports = {
loader: 'babel' loader: 'babel'
}, { }, {
test: /(\.scss|\.css)$/, test: /(\.scss|\.css)$/,
loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass') loader: ExtractTextPlugin.extract('style', 'css?sourceMap&modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass?sourceMap')
} }
] ]
}, },