aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorLuis Iván Cuende <me@luisivan.net>2016-12-14 15:38:55 +0800
committerLuis Iván Cuende <me@luisivan.net>2016-12-14 15:38:55 +0800
commit233094e19d862014937e8f765fd5961d40fc3fbe (patch)
tree6ecbaea9d35213bf0d63ffb269973e7ef3cf4ee8 /ui
parent9e3fa3cfba20299413df87d18158180c7798d2ac (diff)
downloadtangerine-wallet-browser-233094e19d862014937e8f765fd5961d40fc3fbe.tar
tangerine-wallet-browser-233094e19d862014937e8f765fd5961d40fc3fbe.tar.gz
tangerine-wallet-browser-233094e19d862014937e8f765fd5961d40fc3fbe.tar.bz2
tangerine-wallet-browser-233094e19d862014937e8f765fd5961d40fc3fbe.tar.lz
tangerine-wallet-browser-233094e19d862014937e8f765fd5961d40fc3fbe.tar.xz
tangerine-wallet-browser-233094e19d862014937e8f765fd5961d40fc3fbe.tar.zst
tangerine-wallet-browser-233094e19d862014937e8f765fd5961d40fc3fbe.zip
Beautified disclaimer
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js1
-rw-r--r--ui/app/css/index.css4
-rw-r--r--ui/app/first-time/disclaimer.js20
3 files changed, 14 insertions, 11 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 9538a6b93..d870cec4a 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -114,7 +114,6 @@ App.prototype.renderAppBar = function () {
alignItems: 'center',
visibility: props.isUnlocked ? 'visible' : 'none',
background: props.isUnlocked ? 'white' : 'none',
- height: '36px',
position: 'relative',
zIndex: 2,
},
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 975a5289b..cdaac9b37 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -112,9 +112,7 @@ button.btn-thin {
font-size: 13px;
}
-.app-header {
- padding: 6px 8px;
-}
+.app-header {}
.app-header h1 {
font-family: 'Montserrat Regular';
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js
index 819d4a110..ff3d91e7f 100644
--- a/ui/app/first-time/disclaimer.js
+++ b/ui/app/first-time/disclaimer.js
@@ -29,7 +29,8 @@ DisclaimerScreen.prototype.render = function () {
style: {
background: '#EBEBEB',
color: '#AEAEAE',
- marginBottom: 24,
+ marginTop: 0,
+ marginBottom: 0,
width: '100%',
fontSize: '20px',
textAlign: 'center',
@@ -42,8 +43,8 @@ DisclaimerScreen.prototype.render = function () {
h('style', `
.markdown {
- font-family: Times New Roman;
overflow-x: hidden;
+ font-weight: lighter;
}
.markdown h1, .markdown h2, .markdown h3 {
margin: 10px 0;
@@ -75,10 +76,10 @@ DisclaimerScreen.prototype.render = function () {
}
},
style: {
- background: 'rgb(235, 235, 235)',
- height: '310px',
- padding: '6px',
- width: '80%',
+ background: 'transparent',
+ height: '415px',
+ padding: '0 5px',
+ width: '100%',
overflowY: 'scroll',
},
}, [
@@ -91,7 +92,12 @@ DisclaimerScreen.prototype.render = function () {
]),
h('button', {
- style: { marginTop: '18px' },
+ style: {
+ width: '100%',
+ position: 'absolute',
+ bottom: 0,
+ left: 0,
+ },
disabled,
onClick: () => this.props.dispatch(actions.agreeToDisclaimer()),
}, disabled ? 'Scroll Down to Enable' : 'I Agree'),