Merge branch 'dev' into changelog

old
Kiko Beats 2016-08-24 20:11:25 +02:00
commit b02ddf6eea
No known key found for this signature in database
GPG Key ID: 8FA93B22CCF04B96
3 changed files with 4 additions and 3 deletions

View File

@ -71,6 +71,7 @@ const factory = (IconButton, Menu) => {
ripple={this.props.menuRipple}
selectable={this.props.selectable}
selected={this.props.selected}
theme={this.props.theme}
>
{this.props.children}
</Menu>

View File

@ -1,7 +1,7 @@
import React, { Component, PropTypes } from 'react';
import ReactDOM from 'react-dom';
import classnames from 'classnames';
import update from 'react-addons-update';
import update from 'immutability-helper';
import { themr } from 'react-css-themr';
import { RIPPLE } from '../identifiers.js';
import events from '../utils/events';

View File

@ -63,6 +63,7 @@
"extract-text-webpack-plugin": "~1.0.1",
"git-dirty": "~1.0.2",
"glob": "~7.0.3",
"immutability-helper": "~2.0.0",
"karma": "~1.1.2",
"karma-chrome-launcher": "~1.0.1",
"karma-cli": "~1.0.0",
@ -79,7 +80,6 @@
"react": "~15.3.0",
"react-addons-css-transition-group": "~15.3.0",
"react-addons-test-utils": "~15.3.0",
"react-addons-update": "~15.3.0",
"react-docgen": "~2.8.2",
"react-dom": "~15.3.0",
"react-transform-catch-errors": "~1.0.2",
@ -115,10 +115,10 @@
"license": "MIT",
"peerDependencies": {
"classnames": "~2.2.0",
"immutability-helper": "~2.0.0",
"normalize.css": "~4.2.0",
"react": "~0.14 || ~15.3.0",
"react-addons-css-transition-group": "~0.14.0 || ~15.3.0",
"react-addons-update": "~0.14 || ~15.3.0",
"react-dom": "~0.14.0 || ~15.3.0"
}
}