Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
jossmac committed May 16, 2016
2 parents 0630cd0 + 42ec418 commit f414614
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Lightbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Lightbox extends Component {
'handleResize',
]);

this.state = {};
this.state = { windowHeight: 0 };
}

componentWillReceiveProps (nextProps) {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const styles = {
textAlign: 'center',
top: 0,
width: '100%',
zIndex: 1001,
zIndex: 2001,
},
content: {
display: 'inline-block',
Expand Down

0 comments on commit f414614

Please sign in to comment.