From 8b8a6e1a64e86321770085d2a78deb25db523ff9 Mon Sep 17 00:00:00 2001
From: SleepWalker <mybox@udf.su>
Date: Sat, 28 May 2016 01:36:01 +0300
Subject: [PATCH] Update password request popup to use new styles. Add close
 button for contact popup

---
 src/components/contact/ContactForm.jsx        |  2 +-
 src/components/contact/contactForm.scss       |  2 --
 .../PasswordRequestForm.jsx                   | 29 +++++++++++--------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/contact/ContactForm.jsx b/src/components/contact/ContactForm.jsx
index e87c3d7..9245d0a 100644
--- a/src/components/contact/ContactForm.jsx
+++ b/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 {
diff --git a/src/components/contact/contactForm.scss b/src/components/contact/contactForm.scss
index adfc8cf..35a71da 100644
--- a/src/components/contact/contactForm.scss
+++ b/src/components/contact/contactForm.scss
@@ -6,8 +6,6 @@
 }
 
 .close {
-    display: none;
-
     position: absolute;
     right: 10px;
     top: 10px;
diff --git a/src/components/profile/passwordRequestForm/PasswordRequestForm.jsx b/src/components/profile/passwordRequestForm/PasswordRequestForm.jsx
index bb8e453..27b656b 100644
--- a/src/components/profile/passwordRequestForm/PasswordRequestForm.jsx
+++ b/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,19 +22,23 @@ export default class PasswordRequestForm extends Component {
             <Form onSubmit={this.onFormSubmit}
                 form={form}
             >
-                <h2>
-                    <Message {...messages.title} />
-                </h2>
+                <div className={popupStyles.header}>
+                    <h2 className={popupStyles.headerTitle}>
+                        <Message {...messages.title} />
+                    </h2>
+                </div>
 
-                <Input {...form.bindField('password')}
-                    type="password"
-                    required
-                    autoFocus
-                    color="green"
-                    skin="light"
-                    icon="key"
-                    placeholder={messages.pleaseEnterPassword}
-                />
+                <div className={popupStyles.body}>
+                    <Input {...form.bindField('password')}
+                        type="password"
+                        required
+                        autoFocus
+                        color="green"
+                        skin="light"
+                        icon="key"
+                        placeholder={messages.pleaseEnterPassword}
+                    />
+                </div>
                 <Button color="green" label="OK" block type="submit" />
             </Form>
         );