+ + + diff --git a/web-ui/src/account_recovery/account_recovery.js b/web-ui/src/account_recovery/account_recovery.js new file mode 100644 index 00000000..f2421bfc --- /dev/null +++ b/web-ui/src/account_recovery/account_recovery.js @@ -0,0 +1,18 @@ +import React from 'react' +import { render } from 'react-dom' +import a11y from 'react-a11y' +import { I18nextProvider } from 'react-i18next' + +import Page from './page' +import i18n from '../i18n' + +import 'font-awesome/scss/font-awesome.scss' + +if(process.env.NODE_ENV === 'development') a11y(React); + +render( + + + , + document.getElementById('root') +); diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js new file mode 100644 index 00000000..a02d307c --- /dev/null +++ b/web-ui/src/account_recovery/page.js @@ -0,0 +1,28 @@ +import React from 'react' +import { translate } from 'react-i18next' + +import './page.scss' + +export const Page = ({ t }) => ( +

{t('backup-account.image-description')}/

+ +

+) + +export default translate('', { wait: true })(Page) diff --git a/web-ui/src/account_recovery/page.scss b/web-ui/src/account_recovery/page.scss new file mode 100644 index 00000000..e7b1504e --- /dev/null +++ b/web-ui/src/account_recovery/page.scss @@ -0,0 +1,176 @@ +@import "~scss/vendor/reset"; +@import "~scss/base/colors"; +@import "~scss/base/fonts"; + +html { + min-height: 100%; +} + +body { + 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 */ + background: -o-linear-gradient(bottom right, $dark_blue, $middle_blue); /* For Opera 11.1 to 12.0 */ + background: -moz-linear-gradient(bottom right, $dark_blue, $middle_blue); /* For Firefox 3.6 to 15 */ + background: linear-gradient(to bottom right, $dark_blue, $middle_blue); /* Standard syntax */ + color: $dark_grey_text; + min-height: 100%; +} + +h1 { + font-size: 1.3em; + font-weight: 600; +} + +p { + -webkit-margin-before: 0.5em; + -webkit-margin-after: 0.5em; + margin-before: 0.5em; + margin-after: 0.5em; +} + +a { + text-decoration: none; + color: $dark_blue; + font-style: italic; + + .fa { + font-size: 1.6em; + position: relative; + top: 3px; + margin-right: 0.3em; + } + +} + +.field-group { + position:relative; + margin: 1.5em 0; + width: 100%; + + label { + font-size: 0.9em; + margin-bottom: 10px; + display: inline-block; + } + + input { + display: block; + border: none; + border-bottom: solid 1px #4da3b6; + width: 100%; + height: auto; + padding: 0.3em 0px; + } + + input:focus { + outline:none; + border-width: 2px; + } + + input:focus ~ .animated-label, input:valid ~ .animated-label { + top:-12px; + left: 0; + font-size:0.7em; + color:#4da3b6; + } + + .animated-label { + color:#999; + position:absolute; + pointer-events:none; + left: 6px; + top:10px; + transition:0.2s ease all; + -moz-transition:0.2s ease all; + -webkit-transition:0.2s ease all; + } +} + + +button { + background: $dark_blue; + padding: 0.8em; + color: $white; + text-align: center; + border: none; + border-radius: 2px; + font-weight: 300; + width: 100%; + margin-bottom: 1em; +} + +.container { + background: $white; + width: 84%; + // margin: 3% auto; + padding: 6% 5%; + + -webkit-display: flex; + display: flex; + -webkit-align-items: flex-start; + align-items: flex-start; + -webkit-flex-direction: column; + flex-direction: column; +} + +img { + width: 50%; + -webkit-align-self: center; + align-self: center; +} + +@media only screen and (min-width : 500px) { + body { + font-size: 1.3em; + } + + form { + display: flex; + -webkit-display: flex; + -webkit-flex-direction: column; + flex-direction: column; + + .field-group, button, div { + flex-basis: 70%; + -webkit-align-self: center; + align-self: center; + } + } +} + +@media only screen and (min-width : 960px) { + .container{ + width: 60%; + padding: 3%; + -webkit-align-items: flex-start; + align-items: flex-start; + -webkit-flex-direction: row; + flex-direction: row; + max-width: 700px; + } + + form { + margin-left: 2.5em; + + .field-group, button, div { + width: 300px; + -webkit-align-self: flex-start; + align-self: flex-start; + } + + .field-group { + margin-top: 3em; + font-size: 1em; + } + } + + img { + width: 300px; + } + + button { + font-size: 0.8em; + margin-bottom: 1em; + } +} -- cgit v1.2.3 From 1204842f3eb792b6f12445edf1a79532493a3d55 Mon Sep 17 00:00:00 2001 From: Tayane Fernandes Date: Tue, 7 Feb 2017 17:47:49 -0200 Subject: [#922] Add copyright with @anikarni --- web-ui/src/account_recovery/account_recovery.js | 17 +++++++++++++++++ web-ui/src/account_recovery/page.js | 17 +++++++++++++++++ web-ui/src/account_recovery/page.scss | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) (limited to 'web-ui/src/account_recovery') diff --git a/web-ui/src/account_recovery/account_recovery.js b/web-ui/src/account_recovery/account_recovery.js index f2421bfc..6c12e326 100644 --- a/web-ui/src/account_recovery/account_recovery.js +++ b/web-ui/src/account_recovery/account_recovery.js @@ -1,3 +1,20 @@ +/* + * 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 . + */ + import React from 'react' import { render } from 'react-dom' import a11y from 'react-a11y' diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js index a02d307c..79eca8a7 100644 --- a/web-ui/src/account_recovery/page.js +++ b/web-ui/src/account_recovery/page.js @@ -1,3 +1,20 @@ +/* + * 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 . + */ + import React from 'react' import { translate } from 'react-i18next' diff --git a/web-ui/src/account_recovery/page.scss b/web-ui/src/account_recovery/page.scss index e7b1504e..6cd8c5aa 100644 --- a/web-ui/src/account_recovery/page.scss +++ b/web-ui/src/account_recovery/page.scss @@ -1,3 +1,20 @@ +/* + * 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 . + */ + @import "~scss/vendor/reset"; @import "~scss/base/colors"; @import "~scss/base/fonts"; -- cgit v1.2.3 From a47f32a7b0728c402787ebe914a0953638734820 Mon Sep 17 00:00:00 2001 From: Tayane Fernandes Date: Tue, 7 Feb 2017 18:09:20 -0200 Subject: [#922] Extract the submit button to a component with @anikarni --- web-ui/src/account_recovery/page.js | 7 ++++--- web-ui/src/account_recovery/page.scss | 24 +++--------------------- 2 files changed, 7 insertions(+), 24 deletions(-) (limited to 'web-ui/src/account_recovery') diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js index 79eca8a7..90a1faa4 100644 --- a/web-ui/src/account_recovery/page.js +++ b/web-ui/src/account_recovery/page.js @@ -17,21 +17,22 @@ import React from 'react' import { translate } from 'react-i18next' +import SubmitButton from 'src/common/submit_button' import './page.scss' export const Page = ({ t }) => (

{t('backup-account.title')}

{t('backup-account.paragraph1')}

{t('backup-account.paragraph2')}

- + {t('backup-account.input-label')}

- +

diff --git a/web-ui/src/account_recovery/page.scss b/web-ui/src/account_recovery/page.scss index 6cd8c5aa..2ddb366c 100644 --- a/web-ui/src/account_recovery/page.scss +++ b/web-ui/src/account_recovery/page.scss @@ -104,23 +104,10 @@ a { } } - -button { - background: $dark_blue; - padding: 0.8em; - color: $white; - text-align: center; - border: none; - border-radius: 2px; - font-weight: 300; - width: 100%; - margin-bottom: 1em; -} - .container { background: $white; width: 84%; - // margin: 3% auto; + margin: 3% auto; padding: 6% 5%; -webkit-display: flex; @@ -148,7 +135,7 @@ img { -webkit-flex-direction: column; flex-direction: column; - .field-group, button, div { + .field-group, div { flex-basis: 70%; -webkit-align-self: center; align-self: center; @@ -170,7 +157,7 @@ img { form { margin-left: 2.5em; - .field-group, button, div { + .field-group, div { width: 300px; -webkit-align-self: flex-start; align-self: flex-start; @@ -185,9 +172,4 @@ img { img { width: 300px; } - - button { - font-size: 0.8em; - margin-bottom: 1em; - } } -- cgit v1.2.3 From 31b0bcaa673794024a71065be76681150ad4b9d6 Mon Sep 17 00:00:00 2001 From: Tayane Fernandes Date: Tue, 7 Feb 2017 18:51:08 -0200 Subject: [#922] Extract input field to a component with @anikarni --- web-ui/src/account_recovery/page.js | 8 ++---- web-ui/src/account_recovery/page.scss | 53 ++--------------------------------- 2 files changed, 5 insertions(+), 56 deletions(-) (limited to 'web-ui/src/account_recovery') diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js index 90a1faa4..d1bcb464 100644 --- a/web-ui/src/account_recovery/page.js +++ b/web-ui/src/account_recovery/page.js @@ -17,7 +17,8 @@ import React from 'react' import { translate } from 'react-i18next' -import SubmitButton from 'src/common/submit_button' +import SubmitButton from 'src/common/submit_button/submit_button' +import InputField from 'src/common/input_field/input_field' import './page.scss' @@ -28,10 +29,7 @@ export const Page = ({ t }) => (

{t('backup-account.title')}

{t('backup-account.paragraph1')}

{t('backup-account.paragraph2')}

- - {t('backup-account.input-label')} -