diff --git a/components/button/style.scss b/components/button/style.scss
index 6c6042ff..adeacdc4 100644
--- a/components/button/style.scss
+++ b/components/button/style.scss
@@ -7,7 +7,6 @@
height: $button-height;
flex-direction: row;
align-items: center;
- overflow: hidden;
color: $button-default-text-color;
text-align: center;
text-decoration: none;
@@ -107,6 +106,7 @@
[data-react-toolbox="ripple"] {
border-radius: 50%;
+ overflow: hidden;
}
}
diff --git a/components/list/item.jsx b/components/list/item.jsx
index 3796137f..cd8dc9a9 100644
--- a/components/list/item.jsx
+++ b/components/list/item.jsx
@@ -55,7 +55,7 @@ class ListItem extends React.Component {
render () {
return (
-
+
{ this.props.to ? {this.renderContent()} : this.renderContent() }
);
diff --git a/components/list/style.scss b/components/list/style.scss
index ddbb5fcd..addc7e91 100644
--- a/components/list/style.scss
+++ b/components/list/style.scss
@@ -32,7 +32,7 @@
.list + & {
margin-top: - $list-vertical-padding;
}
- .item ~ & {
+ .list-item ~ & {
margin: $list-vertical-padding 0;
}
}
diff --git a/components/ripple/style.scss b/components/ripple/style.scss
index d7339f41..a25845fc 100644
--- a/components/ripple/style.scss
+++ b/components/ripple/style.scss
@@ -20,7 +20,6 @@
bottom: 0;
left: 0;
z-index: $z-index-normal;
- overflow: hidden;
pointer-events: none;
}
diff --git a/package.json b/package.json
index 17c3bd8b..b497e735 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
"eslint-plugin-react": "^3.3.1",
"expect": "^1.8.0",
"express": "^4.13.3",
+ "extract-text-webpack-plugin": "^0.8.2",
"karma": "^0.13.3",
"karma-chrome-launcher": "^0.2.0",
"karma-cli": "^0.1.0",
diff --git a/spec/index.html b/spec/index.html
index 271a841a..a5b808ba 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -13,6 +13,7 @@
+
diff --git a/spec/style.scss b/spec/style.scss
index fba9f62e..5058eda3 100644
--- a/spec/style.scss
+++ b/spec/style.scss
@@ -3,10 +3,10 @@
> h1, > h3 {
line-height: 100%;
}
- h5 {
+ section > h5 {
margin-top: 3.2rem;
}
- p {
+ section > p {
margin-bottom: 1rem;
}
[data-react-toolbox='card'] {
diff --git a/webpack.config.development.js b/webpack.config.development.js
index 93fc26b9..84a77059 100644
--- a/webpack.config.development.js
+++ b/webpack.config.development.js
@@ -1,6 +1,7 @@
const path = require('path');
const webpack = require('webpack');
const autoprefixer = require('autoprefixer');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
module.exports = {
context: __dirname,
@@ -25,12 +26,13 @@ module.exports = {
loader: 'babel'
}, {
test: /(\.scss|\.css)$/,
- loader: 'style!css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass'
+ loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass')
}
]
},
postcss: [autoprefixer],
plugins: [
+ new ExtractTextPlugin('spec.css', { allChunks: true }),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin(),
new webpack.DefinePlugin({