summaryrefslogtreecommitdiff
path: root/web-ui/src
diff options
context:
space:
mode:
authorTayane Fernandes <tayane.rmf@gmail.com>2017-02-09 11:22:09 -0200
committerTayane Fernandes <tayane.rmf@gmail.com>2017-02-09 11:22:09 -0200
commitdd4f8569848b4dbd688c07c03b17a898ed6df25d (patch)
treee40ea5596c9c204c4c12337d9be3be7e88e8cddf /web-ui/src
parenta76b524c147c79fefa7943230a33e7904af3c070 (diff)
[#922] Add logo and icons to the header
with @anikarni
Diffstat (limited to 'web-ui/src')
-rw-r--r--web-ui/src/account_recovery/page.js8
-rw-r--r--web-ui/src/account_recovery/page.scss7
-rw-r--r--web-ui/src/common/header/header.js15
-rw-r--r--web-ui/src/common/header/header.scss36
4 files changed, 56 insertions, 10 deletions
diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js
index 449f391f..2ae26d12 100644
--- a/web-ui/src/account_recovery/page.js
+++ b/web-ui/src/account_recovery/page.js
@@ -29,7 +29,11 @@ export const Page = ({ t }) => (
<Header />
<section>
<div className='container'>
- <img className='backup-account-image' src='assets/images/forgot-my-password.svg' alt={t('backup-account.image-description')} />
+ <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>
@@ -37,7 +41,7 @@ export const Page = ({ t }) => (
<InputField name='email' label={t('backup-account.input-label')} />
<SubmitButton buttonText={t('backup-account.button')} />
<div>
- <a href='/'>
+ <a href='/' className='link'>
<i className='fa fa-angle-left' aria-hidden='true' />
<span>{t('back-to-inbox')}</span>
</a>
diff --git a/web-ui/src/account_recovery/page.scss b/web-ui/src/account_recovery/page.scss
index c28aa4d2..a344b957 100644
--- a/web-ui/src/account_recovery/page.scss
+++ b/web-ui/src/account_recovery/page.scss
@@ -27,6 +27,10 @@ body, #root {
min-height: 100%;
}
+a {
+ text-decoration: none;
+}
+
.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 */
@@ -54,8 +58,7 @@ p {
margin-bottom: 0.5em;
}
-a {
- text-decoration: none;
+.link {
color: $dark_blue;
font-style: italic;
diff --git a/web-ui/src/common/header/header.js b/web-ui/src/common/header/header.js
index b32988c6..db9011e3 100644
--- a/web-ui/src/common/header/header.js
+++ b/web-ui/src/common/header/header.js
@@ -22,10 +22,17 @@ import './header.scss';
export const Header = ({ t }) => (
<header className='header-wrapper'>
<div className='header-content'>
- <img className='header-logo' src='/startup-assets/pixelated-logo-orange.svg' alt='Pixelated' />
- </div>
- <div className='header-icons'>
- <a href='/'><i className='fa fa-sign-out' aria-hidden='true'></i></a>
+ <img
+ className='header-logo'
+ src='/startup-assets/pixelated-logo-orange.svg'
+ alt='Pixelated'
+ />
+ <div className='header-icons'>
+ <a href='/'>
+ <span>{t('logout')}</span>
+ <i className='fa fa-sign-out' aria-hidden='true' />
+ </a>
+ </div>
</div>
</header>
);
diff --git a/web-ui/src/common/header/header.scss b/web-ui/src/common/header/header.scss
index d7472677..bd79280d 100644
--- a/web-ui/src/common/header/header.scss
+++ b/web-ui/src/common/header/header.scss
@@ -23,7 +23,7 @@
background: $white;
box-shadow: 0 2px 3px 0 $shadow;
- padding: 5px 0;
+ padding: 7px 0;
}
.header-content {
@@ -42,13 +42,45 @@
position: absolute;
right: 6%;
+ span {
+ display: none;
+ }
+
.fa {
font-size: 1.3em;
+ margin-left: 0.4em;
color: $medium_light_grey;
}
}
-@media only screen and (min-width : 500px) {
+@media only screen and (min-width : 960px) {
+ .header-content {
+ flex-basis: 64%;
+ max-width: 820px;
+ justify-content: space-between;
+ }
+
+ .header-icons {
+ position: relative;
+ right: 0;
+ a {
+ display: flex;
+ align-items: center;
+ }
+
+ span {
+ display: inline;
+ color: $medium_light_grey;
+ font-style: normal;
+ font-size: 0.7em;
+ padding-bottom: 0.1em;
+ }
+
+ .fa {
+ font-size: 1em;
+ margin-right: 0;
+ }
+ }
}