Update password request popup to use new styles. Add close button for contact popup

src/components/contact/ContactForm.jsx

@@ -6,9 +6,9 @@ import { FormattedMessage as Message } from 'react-intl';
 import { Input, TextArea, Button, Form, FormModel, Dropdown } from 'components/ui/form';
 import site from 'services/api/site';
 import icons from 'components/ui/icons.scss';
+import popupStyles from 'components/ui/popup/popup.scss';
 
 import styles from './contactForm.scss';
-import popupStyles from 'components/ui/popup/popup.scss';
 import messages from './contactForm.intl.json';
 
 export default class ContactForm extends Component {

src/components/contact/contactForm.scss

@@ -6,8 +6,6 @@
 }
 
 .close {
-    display: none;
-
     position: absolute;
     right: 10px;
     top: 10px;

src/components/profile/passwordRequestForm/PasswordRequestForm.jsx

@@ -3,6 +3,7 @@ import React, { Component, PropTypes } from 'react';
 import { FormattedMessage as Message } from 'react-intl';
 
 import { Form, Button, Input, FormModel } from 'components/ui/form';
+import popupStyles from 'components/ui/popup/popup.scss';
 
 import messages from './PasswordRequestForm.intl.json';
 
@@ -21,10 +22,13 @@ export default class PasswordRequestForm extends Component {
             <Form onSubmit={this.onFormSubmit}
                 form={form}
             >
-                <h2>
+                <div className={popupStyles.header}>
+                    <h2 className={popupStyles.headerTitle}>
                         <Message {...messages.title} />
                     </h2>
+                </div>
 
+                <div className={popupStyles.body}>
                     <Input {...form.bindField('password')}
                         type="password"
                         required
@@ -34,6 +38,7 @@ export default class PasswordRequestForm extends Component {
                         icon="key"
                         placeholder={messages.pleaseEnterPassword}
                     />
+                </div>
                 <Button color="green" label="OK" block type="submit" />
             </Form>
         );