diff options
Diffstat (limited to 'web-ui/src')
-rw-r--r-- | web-ui/src/account_recovery/page.js | 34 | ||||
-rw-r--r-- | web-ui/src/account_recovery/page.scss | 19 | ||||
-rw-r--r-- | web-ui/src/common/footer/footer.js | 40 | ||||
-rw-r--r-- | web-ui/src/common/footer/footer.scss | 57 |
4 files changed, 132 insertions, 18 deletions
diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js index ac01529d..ce791dd4 100644 --- a/web-ui/src/account_recovery/page.js +++ b/web-ui/src/account_recovery/page.js @@ -19,25 +19,31 @@ import React from 'react'; import { translate } from 'react-i18next'; import SubmitButton from 'src/common/submit_button/submit_button'; import InputField from 'src/common/input_field/input_field'; +import Footer from 'src/common/footer/footer'; import './page.scss'; export const Page = ({ t }) => ( - <div className='container'> - <img src='assets/images/forgot-my-password.svg' alt={t('backup-account.image-description')} /> - <form> - <h1>{t('backup-account.title')}</h1> - <p>{t('backup-account.paragraph1')}</p> - <p>{t('backup-account.paragraph2')}</p> - <InputField name='email' label={t('backup-account.input-label')} /> - <SubmitButton buttonText={t('backup-account.button')} /> - <div> - <a href='/'> - <i className='fa fa-angle-left' aria-hidden='true' /> - <span>{t('back-to-inbox')}</span> - </a> + <div className='page'> + <section> + <div className='container'> + <img className='backup-account-image' src='assets/images/forgot-my-password.svg' alt={t('backup-account.image-description')} /> + <form> + <h1>{t('backup-account.title')}</h1> + <p>{t('backup-account.paragraph1')}</p> + <p>{t('backup-account.paragraph2')}</p> + <InputField name='email' label={t('backup-account.input-label')} /> + <SubmitButton buttonText={t('backup-account.button')} /> + <div> + <a href='/'> + <i className='fa fa-angle-left' aria-hidden='true' /> + <span>{t('back-to-inbox')}</span> + </a> + </div> + </form> </div> - </form> + </section> + <Footer /> </div> ); diff --git a/web-ui/src/account_recovery/page.scss b/web-ui/src/account_recovery/page.scss index 619d1105..5947d463 100644 --- a/web-ui/src/account_recovery/page.scss +++ b/web-ui/src/account_recovery/page.scss @@ -19,11 +19,15 @@ @import "~scss/base/colors"; @import "~scss/base/fonts"; -html { +html, body, #root { + height: 100%; +} + +body, #root { min-height: 100%; } -body { +.page { font-family: "Open Sans", "Microsoft YaHei", "Hiragino Sans GB", "Hiragino Sans GB W3", "微软雅黑", "Helvetica Neue", Arial, sans-serif; background: $dark_blue; /* For browsers that do not support gradients */ background: -webkit-linear-gradient(left top, $dark_blue, $middle_blue); /* For Safari 5.1 to 6.0 */ @@ -32,6 +36,12 @@ body { background: linear-gradient(to bottom right, $dark_blue, $middle_blue); /* Standard syntax */ color: $dark_grey_text; min-height: 100%; + display: flex; + flex-direction: column; +} + +section { + flex: 1 0 auto; } h1 { @@ -68,9 +78,10 @@ a { display: flex; align-items: flex-start; flex-direction: column; + box-shadow: 0 2px 3px 0 $shadow; } -img { +.backup-account-image { width: 50%; align-self: center; } @@ -109,7 +120,7 @@ img { } } - img { + .backup-account-image { width: 300px; } } diff --git a/web-ui/src/common/footer/footer.js b/web-ui/src/common/footer/footer.js new file mode 100644 index 00000000..254a19f7 --- /dev/null +++ b/web-ui/src/common/footer/footer.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + */ + +import React from 'react'; +import { translate } from 'react-i18next'; +import './footer.scss'; + +export const Footer = ({ t }) => ( + <footer className='footer-wrapper'> + <div className='footer-content'> + <img className='footer-image' src='/assets/images/lab.svg' alt='' /> + <div> + {t('footer-text')} + <a className='footer-link' href='mailto:team@pixelated-project.org'> + {' team@pixelated-project.org'} + </a> + </div> + </div> + </footer> +); + +Footer.propTypes = { + t: React.PropTypes.func.isRequired +}; + +export default translate('', { wait: true })(Footer); diff --git a/web-ui/src/common/footer/footer.scss b/web-ui/src/common/footer/footer.scss new file mode 100644 index 00000000..4ea61285 --- /dev/null +++ b/web-ui/src/common/footer/footer.scss @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + */ +@import "~scss/base/colors"; + +.footer-wrapper { + display: flex; + justify-content: center; + font-size: 0.8em; + color: $dark_slate_gray; +} + +.footer-content { + display: inline; + margin: 2% 3% 5% 3%; + display: flex; + align-items: center; +} + +.footer-image { + margin: 0 0.7em; +} + +.footer-link { + color: $white; + font-style: normal; + font-weight: 500; +} + +@media only screen and (min-width : 500px) { + .footer-wrapper { + font-size: 0.6em; + } + + .footer-content { + margin: 0 0 2% 0; + } +} + +@media only screen and (min-width : 960px) { + .footer-content { + margin-bottom: 1%; + } +} |