diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-10-12 07:13:53 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-10-12 07:13:53 +0800 |
commit | 5d01d50c16490c025addab4fc2461495ca9d0a5f (patch) | |
tree | 2a4579690d7ba410adea51b605f7aa724d4edf84 /ui/app/first-time | |
parent | e1ece0f0e3bb53501409e5f8b3f5d904040ac2e8 (diff) | |
parent | bbaf79f576443f6325d6c32d119f020a61bffa67 (diff) | |
download | tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar.gz tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar.zst tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.zip |
Merge branch 'master' into i721-ScrollAccountList
Diffstat (limited to 'ui/app/first-time')
-rw-r--r-- | ui/app/first-time/disclaimer.js | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index c6174a220..819d4a110 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -19,6 +19,9 @@ function DisclaimerScreen () { } DisclaimerScreen.prototype.render = function () { + const state = this.state || {disclaimerDisabled: true} + const disabled = state.disclaimerDisabled + return ( h('.flex-column.flex-center.flex-grow', [ @@ -40,18 +43,38 @@ DisclaimerScreen.prototype.render = function () { .markdown { font-family: Times New Roman; + overflow-x: hidden; } .markdown h1, .markdown h2, .markdown h3 { margin: 10px 0; - font-family: arial sans-serif; font-weight: bold; } + .markdown strong { + font-weight: bold; + } + .markdown em { + font-style: italic; + } + + .markdown p { + margin: 10px 0; + } + + .markdown a { + color: blue; + } + `), h('div.markdown', { + onScroll: (e) => { + var object = e.currentTarget + if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) { + this.setState({disclaimerDisabled: false}) + } + }, style: { - // whiteSpace: 'pre-line', background: 'rgb(235, 235, 235)', height: '310px', padding: '6px', @@ -69,9 +92,9 @@ DisclaimerScreen.prototype.render = function () { h('button', { style: { marginTop: '18px' }, + disabled, onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), - }, 'I Agree'), + }, disabled ? 'Scroll Down to Enable' : 'I Agree'), ]) ) } - |