scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-18 09:00:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix remaining Modal styles

Browse source
This commit is contained in:
Ray Schamp 2015-10-25 11:58:12 -04:00
parent 7e74c4a105
commit 8cde05fdc8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/navigation/navigation.jsx
View file

@ -317,7 +317,7 @@ var Navigation = React.createClass({
</ul> </ul>
<Modal isOpen={this.state.canceledDeletionOpen} <Modal isOpen={this.state.canceledDeletionOpen}
onRequestClose={this.closeCanceledDeletion} onRequestClose={this.closeCanceledDeletion}
frameSettings={{padding: 15}}> style={{content:{padding: 15}}}>
<h4>Your Account Will Not Be Deleted</h4> <h4>Your Account Will Not Be Deleted</h4>
<p> <p>
Your account was scheduled for deletion but you logged in. Your account has been reactivated. Your account was scheduled for deletion but you logged in. Your account has been reactivated.

7
src/views/splash/splash.jsx
View file

@ -1,4 +1,5 @@
var injectIntl = require('react-intl').injectIntl; var injectIntl = require('react-intl').injectIntl;
var omit = require('lodash.omit');
var React = require('react'); var React = require('react');
var render = require('../../lib/render.jsx'); var render = require('../../lib/render.jsx');
@ -290,6 +291,7 @@ var Splash = injectIntl(React.createClass({
var showEmailConfirmation = ( var showEmailConfirmation = (
this.state.session.user && this.state.session.flags.has_outstanding_email_confirmation && this.state.session.user && this.state.session.flags.has_outstanding_email_confirmation &&
this.state.session.flags.confirm_email_banner); this.state.session.flags.confirm_email_banner);
var emailConfirmationStyle = {width: 500, height: 330, padding: 1};
return ( return (
<div className="splash"> <div className="splash">
{showEmailConfirmation ? [ {showEmailConfirmation ? [
@ -303,11 +305,10 @@ var Splash = injectIntl(React.createClass({
<Modal key="emailConfirmationModal" <Modal key="emailConfirmationModal"
isOpen={this.state.emailConfirmationModalOpen} isOpen={this.state.emailConfirmationModalOpen}
onRequestClose={this.hideEmailConfirmationModal} onRequestClose={this.hideEmailConfirmationModal}
frameSettings={{width: 500, height: 330, padding: 1}}> style={{content: emailConfirmationStyle}}>
<iframe <iframe
src="/accounts/email_resend_standalone/" src="/accounts/email_resend_standalone/"
width="500" {...omit(emailConfirmationStyle, 'padding')} />
height="330" />
</Modal> </Modal>
] : []} ] : []}
<div key="inner" className="inner"> <div key="inner" className="inner">