diff --git a/packages/react-bootstrap-table2-example/.storybook/webpack.config.js b/packages/react-bootstrap-table2-example/.storybook/webpack.config.js index a3995c8..75e6df6 100644 --- a/packages/react-bootstrap-table2-example/.storybook/webpack.config.js +++ b/packages/react-bootstrap-table2-example/.storybook/webpack.config.js @@ -9,6 +9,7 @@ const sourceStylePath = path.join(__dirname, '../../react-bootstrap-table2/style const paginationStylePath = path.join(__dirname, '../../react-bootstrap-table2-paginator/style'); const filterStylePath = path.join(__dirname, '../../react-bootstrap-table2-filter/style'); const toolkitSourcePath = path.join(__dirname, '../../react-bootstrap-table2-toolkit/index.js'); +const toolkitStylePath = path.join(__dirname, '../../react-bootstrap-table2-toolkit/style'); const storyPath = path.join(__dirname, '../stories'); const examplesPath = path.join(__dirname, '../examples'); const srcPath = path.join(__dirname, '../src'); @@ -43,7 +44,13 @@ const loaders = [{ }, { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'], - include: [storyPath, sourceStylePath, paginationStylePath, filterStylePath], + include: [ + storyPath, + sourceStylePath, + paginationStylePath, + filterStylePath, + toolkitStylePath + ], }, { test: /\.(jpg|png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000', diff --git a/packages/react-bootstrap-table2-example/stories/index.js b/packages/react-bootstrap-table2-example/stories/index.js index 9fc20d1..d35cbcb 100644 --- a/packages/react-bootstrap-table2-example/stories/index.js +++ b/packages/react-bootstrap-table2-example/stories/index.js @@ -229,6 +229,7 @@ import 'stories/stylesheet/storybook.scss'; import '../../react-bootstrap-table2/style/react-bootstrap-table2.scss'; import '../../react-bootstrap-table2-paginator/style/react-bootstrap-table2-paginator.scss'; import '../../react-bootstrap-table2-filter/style/react-bootstrap-table2-filter.scss'; +import '../../react-bootstrap-table2-toolkit/style/react-bootstrap-table2-toolkit.scss'; // import bootstrap style by given version import bootstrapStyle, { BOOTSTRAP_VERSION } from './bootstrap-style'; diff --git a/packages/react-bootstrap-table2-filter/src/components/date.js b/packages/react-bootstrap-table2-filter/src/components/date.js index 25a7fdd..578f558 100644 --- a/packages/react-bootstrap-table2-filter/src/components/date.js +++ b/packages/react-bootstrap-table2-filter/src/components/date.js @@ -132,7 +132,10 @@ class DateFilter extends Component { className={ `filter date-filter ${className}` } style={ style } > -