From 8cde05fdc89fdd865ee3ff5b89c60f895a72b10c Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Sun, 25 Oct 2015 11:58:12 -0400
Subject: [PATCH] Fix remaining Modal styles

---
 src/components/navigation/navigation.jsx | 2 +-
 src/views/splash/splash.jsx              | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/navigation/navigation.jsx b/src/components/navigation/navigation.jsx
index c1e33087f..d88701e5f 100644
--- a/src/components/navigation/navigation.jsx
+++ b/src/components/navigation/navigation.jsx
@@ -317,7 +317,7 @@ var Navigation = React.createClass({
                 </ul>
                 <Modal isOpen={this.state.canceledDeletionOpen}
                        onRequestClose={this.closeCanceledDeletion}
-                       frameSettings={{padding: 15}}>
+                       style={{content:{padding: 15}}}>
                     <h4>Your Account Will Not Be Deleted</h4>
                     <p>
                         Your account was scheduled for deletion but you logged in. Your account has been reactivated.
diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx
index f264b5ae5..a5357039e 100644
--- a/src/views/splash/splash.jsx
+++ b/src/views/splash/splash.jsx
@@ -1,4 +1,5 @@
 var injectIntl = require('react-intl').injectIntl;
+var omit = require('lodash.omit');
 var React = require('react');
 var render = require('../../lib/render.jsx');
 
@@ -290,6 +291,7 @@ var Splash = injectIntl(React.createClass({
         var showEmailConfirmation = (
             this.state.session.user && this.state.session.flags.has_outstanding_email_confirmation &&
             this.state.session.flags.confirm_email_banner);
+        var emailConfirmationStyle = {width: 500, height: 330, padding: 1};
         return (
             <div className="splash">
                 {showEmailConfirmation ? [
@@ -303,11 +305,10 @@ var Splash = injectIntl(React.createClass({
                     <Modal key="emailConfirmationModal"
                            isOpen={this.state.emailConfirmationModalOpen}
                            onRequestClose={this.hideEmailConfirmationModal}
-                           frameSettings={{width: 500, height: 330, padding: 1}}>
+                           style={{content: emailConfirmationStyle}}>
                         <iframe
                             src="/accounts/email_resend_standalone/"
-                            width="500"
-                            height="330" />
+                            {...omit(emailConfirmationStyle, 'padding')} />
                     </Modal>
                 ] : []}
                 <div key="inner" className="inner">