diff --git a/src/components/Navigation.js b/src/components/Navigation.js index 671ee72..3c36e13 100644 --- a/src/components/Navigation.js +++ b/src/components/Navigation.js @@ -30,7 +30,7 @@ const Navigation = (props) => { Contact Me - {props.modal ? : ''} + ); } diff --git a/src/components/css/Modal.css b/src/components/css/Modal.css index a303789..fe1729e 100644 --- a/src/components/css/Modal.css +++ b/src/components/css/Modal.css @@ -1,15 +1,25 @@ .modal { - width: 100vw; + display:flex; + width:0; height: 100vh; z-index: 100; position: fixed; top:0; left:0; - opacity: 1; - background-color: rgba(0,0,0,0.4); - display: flex; + opacity: 0; + background-color: rgba(0,0,0,0); justify-content: center; align-items: center; + transition-delay: 70ms, 70ms, 0ms; + transition: opacity 300ms ease-out, width 300ms ease-out, background-color 50ms ease-out; +} + +.modal.show { + width: 100vw; + background-color: rgba(0,0,0,0.4); + opacity: 1; + transition-delay: 0ms, 0ms, 300ms; + transition: opacity 300ms ease-in, width 300ms ease-in, background-color 300ms ease-in; } .modal .box { diff --git a/src/components/subcomponents/ContactModal.js b/src/components/subcomponents/ContactModal.js index 77fccbc..3ac8008 100644 --- a/src/components/subcomponents/ContactModal.js +++ b/src/components/subcomponents/ContactModal.js @@ -23,6 +23,7 @@ const ContactModal = props => { title="Contact Me" content = {renderContent()} onDismiss={props.toggleContactModal} + show={props.show} /> }; diff --git a/src/components/subcomponents/Modal.js b/src/components/subcomponents/Modal.js index cd731b0..afa7b4d 100644 --- a/src/components/subcomponents/Modal.js +++ b/src/components/subcomponents/Modal.js @@ -4,7 +4,7 @@ import '../css/Modal.css'; const Modal = props => { return ReactDOM.createPortal( -
+
e.stopPropagation()} className="box">
{props.title}