Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-braun committed Jan 16, 2018
2 parents 8eefa07 + f07ffd6 commit 7f4c5b4
Show file tree
Hide file tree
Showing 35 changed files with 376 additions and 174 deletions.
4 changes: 2 additions & 2 deletions examples/react-chayns-calendar/Example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ export default class Example extends React.Component {
render() {
return(
<ExampleContainer headline="Calendar">
<div className="content" style={{ position: 'relative', overflow: 'hidden', height: '500px', border: '1px solid black' }}>
<div className="content" style={{ position: 'relative', overflow: 'hidden', height: '700px', border: '1px solid black' }}>
<h2 style={{ marginBottom: '8%' }}>Option 1:</h2>
<div className="accordion accordion--open">
<div className="accordion__head">
Calendar
</div>
<div className="accordion__body">
<div className="accordion__content">
<div className="accordion__content" style={{ minHeight: '200px' }}>
<Calendar onDateSelect={this.onClick}/>
</div>
</div>
Expand Down
191 changes: 126 additions & 65 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chayns-components",
"version": "2.0.2",
"version": "2.0.3",
"description": "some standalone react components",
"main": "lib/index.js",
"scripts": {
Expand Down Expand Up @@ -28,11 +28,11 @@
"babel-preset-react": "^6.23.0",
"babel-preset-stage-0": "^6.22.0",
"css-loader": "^0.28.8",
"eslint": "^4.5.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.3.0",
"eslint": "^4.15.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.5.1",
"html-webpack-plugin": "^2.30.1",
"node-sass": "^4.7.2",
"react-hot-loader": "^1.3.1",
Expand Down
4 changes: 4 additions & 0 deletions src/polyfills/is-finite.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Number.isFinite = Number.isFinite || function (value) {
// eslint-disable-next-line no-restricted-globals
return typeof value === 'number' && isFinite(value);
};
Loading

0 comments on commit 7f4c5b4

Please sign in to comment.