Skip to content

Commit 7f4c5b4

Browse files
committed
Merge branch 'develop'
2 parents 8eefa07 + f07ffd6 commit 7f4c5b4

File tree

35 files changed

+376
-174
lines changed

35 files changed

+376
-174
lines changed

examples/react-chayns-calendar/Example.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ export default class Example extends React.Component {
1717
render() {
1818
return(
1919
<ExampleContainer headline="Calendar">
20-
<div className="content" style={{ position: 'relative', overflow: 'hidden', height: '500px', border: '1px solid black' }}>
20+
<div className="content" style={{ position: 'relative', overflow: 'hidden', height: '700px', border: '1px solid black' }}>
2121
<h2 style={{ marginBottom: '8%' }}>Option 1:</h2>
2222
<div className="accordion accordion--open">
2323
<div className="accordion__head">
2424
Calendar
2525
</div>
2626
<div className="accordion__body">
27-
<div className="accordion__content">
27+
<div className="accordion__content" style={{ minHeight: '200px' }}>
2828
<Calendar onDateSelect={this.onClick}/>
2929
</div>
3030
</div>

package-lock.json

+126-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "chayns-components",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "some standalone react components",
55
"main": "lib/index.js",
66
"scripts": {
@@ -28,11 +28,11 @@
2828
"babel-preset-react": "^6.23.0",
2929
"babel-preset-stage-0": "^6.22.0",
3030
"css-loader": "^0.28.8",
31-
"eslint": "^4.5.0",
32-
"eslint-config-airbnb": "^15.1.0",
33-
"eslint-plugin-import": "^2.7.0",
34-
"eslint-plugin-jsx-a11y": "^6.0.2",
35-
"eslint-plugin-react": "^7.3.0",
31+
"eslint": "^4.15.0",
32+
"eslint-config-airbnb": "^16.1.0",
33+
"eslint-plugin-import": "^2.8.0",
34+
"eslint-plugin-jsx-a11y": "^6.0.3",
35+
"eslint-plugin-react": "^7.5.1",
3636
"html-webpack-plugin": "^2.30.1",
3737
"node-sass": "^4.7.2",
3838
"react-hot-loader": "^1.3.1",

src/polyfills/is-finite.js

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Number.isFinite = Number.isFinite || function (value) {
2+
// eslint-disable-next-line no-restricted-globals
3+
return typeof value === 'number' && isFinite(value);
4+
};

0 commit comments

Comments
 (0)