Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Mollweide committed Mar 2, 2017
2 parents 1e1d17c + 8648356 commit bc45977
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-speed-dial",
"version": "0.4.0",
"version": "0.4.1",
"description": "React Component that implements a speed dial using Material-UI.",
"email": "simon.mollweide@web.de",
"author": "Simon Mollweide <simon.mollweide@web.de>",
Expand Down Expand Up @@ -52,7 +52,7 @@
"speed dial"
],
"peerDependencies": {
"material-ui": "^0.16.0",
"material-ui": "^0.17.0",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-tap-event-plugin": "^1.0.0 || ^2.0.0"
Expand Down Expand Up @@ -85,11 +85,11 @@
"webpack": "^1.13.3"
},
"dependencies": {
"babel-runtime": "^6.18.0",
"material-ui": "^0.16.4",
"react": "^15.4.0",
"react-dom": "^15.4.0",
"react-router": "^3.0.0",
"babel-runtime": "^6.23.0",
"material-ui": "^0.17.0",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-router": "^3.0.2",
"react-tap-event-plugin": "^2.0.1",
"simple-assign": "^0.1.0"
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/bubble-list-item/bubble-list-item.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export default ({ paper, baseTheme }) => {
visible: {
main: {
opacity: 1,
visibility: 'visible',
},

// prop direction
Expand All @@ -56,6 +57,7 @@ export default ({ paper, baseTheme }) => {
invisible: {
main: {
opacity: 0,
visibility: 'hidden',
},

// prop direction
Expand Down
1 change: 1 addition & 0 deletions src/components/speed-dial/speed-dial.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default ({ baseTheme }) => {
position: 'fixed',
width: '100%',
left: 0,
zIndex: 9999,
},
inline: {
position: 'relative',
Expand Down

0 comments on commit bc45977

Please sign in to comment.