diff options
| author | Dan Finlay <somniac@me.com> | 2016-12-17 02:08:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-17 02:08:47 +0800 |
| commit | 1b6ee56cac34cd3544fd375cad342eb8240ae8aa (patch) | |
| tree | 74790ae54c78ea0dfb71329118397dde116ebe44 /ui/app/first-time | |
| parent | e6c01abba4b66c6ef98a9d8155439be002dea5cd (diff) | |
| parent | 6d13ef691f4162caad6b8742a21d0b75f8baccca (diff) | |
| download | tangerine-wallet-browser-1b6ee56cac34cd3544fd375cad342eb8240ae8aa.tar.gz tangerine-wallet-browser-1b6ee56cac34cd3544fd375cad342eb8240ae8aa.tar.zst tangerine-wallet-browser-1b6ee56cac34cd3544fd375cad342eb8240ae8aa.zip | |
Merge pull request #926 from MetaMask/revert-920-dev
Revert "Interface enhancements"
Diffstat (limited to 'ui/app/first-time')
| -rw-r--r-- | ui/app/first-time/disclaimer.js | 20 | ||||
| -rw-r--r-- | ui/app/first-time/init-menu.js | 5 |
2 files changed, 8 insertions, 17 deletions
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index ff3d91e7f..819d4a110 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -29,8 +29,7 @@ DisclaimerScreen.prototype.render = function () { style: { background: '#EBEBEB', color: '#AEAEAE', - marginTop: 0, - marginBottom: 0, + marginBottom: 24, width: '100%', fontSize: '20px', textAlign: 'center', @@ -43,8 +42,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; @@ -76,10 +75,10 @@ DisclaimerScreen.prototype.render = function () { } }, style: { - background: 'transparent', - height: '415px', - padding: '0 5px', - width: '100%', + background: 'rgb(235, 235, 235)', + height: '310px', + padding: '6px', + width: '80%', overflowY: 'scroll', }, }, [ @@ -92,12 +91,7 @@ DisclaimerScreen.prototype.render = function () { ]), h('button', { - style: { - width: '100%', - position: 'absolute', - bottom: 0, - left: 0, - }, + style: { marginTop: '18px' }, disabled, onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), }, disabled ? 'Scroll Down to Enable' : 'I Agree'), diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js index ee0094f36..c41aecc48 100644 --- a/ui/app/first-time/init-menu.js +++ b/ui/app/first-time/init-menu.js @@ -114,10 +114,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { h('button.primary', { onClick: this.createNewVaultAndKeychain.bind(this), style: { - position: 'absolute', - left: 0, - bottom: 0, - width: '100%', + margin: 12, }, }, 'Create'), |