Skip to content

Commit

Permalink
[fixed] Modal div.modal-content should not have hidden class
Browse files Browse the repository at this point in the history
  • Loading branch information
cymen committed May 6, 2015
1 parent 326fc99 commit 1c6c74b
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions src/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const Modal = React.createClass({
onClick={this.props.backdrop === true ? this.handleBackdropClick : null}
ref="modal">
<div className={classNames(dialogClasses)}>
<div className="modal-content" style={{overflow: 'hidden'}}>
<div className="modal-content">
{this.props.title ? this.renderHeader() : null}
{this.props.children}
</div>
Expand Down Expand Up @@ -95,17 +95,23 @@ const Modal = React.createClass({
);
}

let style = this.props.bsStyle;
let bsStyle = this.props.bsStyle;
let classes = {
'modal-header': true
};
classes['bg-' + style] = style;
classes['text-' + style] = style;
classes['bg-' + bsStyle] = bsStyle;
classes['text-' + bsStyle] = bsStyle;

let className = classNames(classes);

let style = {};
if (this.props.bsStyle) {
style.borderTopLeftRadius = 'inherit';
style.borderTopRightRadius = 'inherit';
}

return (
<div className={className}>
<div className={className} style={style}>
{closeButton}
{this.renderTitle()}
</div>
Expand Down

0 comments on commit 1c6c74b

Please sign in to comment.