diff options
| -rw-r--r-- | development/index.html | 12 | ||||
| -rw-r--r-- | development/mocker.js | 2 | ||||
| -rw-r--r-- | development/selector.js | 3 | ||||
| -rw-r--r-- | ui/app/app.js | 5 | ||||
| -rw-r--r-- | ui/app/first-time/disclaimer.js | 5 | ||||
| -rw-r--r-- | ui/app/first-time/disclaimer.txt | 3 |
6 files changed, 23 insertions, 7 deletions
diff --git a/development/index.html b/development/index.html index deb3dc690..aca074f3e 100644 --- a/development/index.html +++ b/development/index.html @@ -11,4 +11,16 @@ <script src="./bundle.js" type="text/javascript" charset="utf-8"></script> </body> + +<style> +html, body, #app-content, .super-dev-container { + height: 100%; + width: 100%; + position: relative; + background: #cccccc; +} +.mock-app-root { + background: #F7F7F7; +} +</style> </html> diff --git a/development/mocker.js b/development/mocker.js index 593037f2e..0656e66ea 100644 --- a/development/mocker.js +++ b/development/mocker.js @@ -54,6 +54,8 @@ render( style: { height: '500px', width: '360px', + boxShadow: '2px 2px 5px grey', + margin: '20px', }, }, [ h(Root, { diff --git a/development/selector.js b/development/selector.js index b58904cdf..c466905ca 100644 --- a/development/selector.js +++ b/development/selector.js @@ -17,6 +17,9 @@ NewComponent.prototype.render = function () { const selected = state.selected || selectedKey return h('select', { + style: { + margin: '20px 20px 0px', + }, value: selected, onChange:(event) => { const selectedKey = event.target.value diff --git a/ui/app/app.js b/ui/app/app.js index 938caffd9..f58f695af 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -61,6 +61,7 @@ App.prototype.render = function () { style: { // Windows was showing a vertical scroll bar: overflow: 'hidden', + position: 'relative', }, }, [ @@ -197,7 +198,7 @@ App.prototype.renderNetworkDropdown = function () { this.setState({ isNetworkMenuOpen: !isOpen }) }, style: { - position: 'fixed', + position: 'absolute', left: 0, zIndex: 0, }, @@ -246,7 +247,7 @@ App.prototype.renderDropdown = function () { this.props.dispatch(actions.closeMenu()) }, style: { - position: 'fixed', + position: 'absolute', right: 0, zIndex: 0, }, diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index f25bf9245..c6174a220 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -22,13 +22,14 @@ DisclaimerScreen.prototype.render = function () { return ( h('.flex-column.flex-center.flex-grow', [ - h('h3.flex-center.text-transform-uppercase', { + h('h3.flex-center.text-transform-uppercase.terms-header', { style: { background: '#EBEBEB', color: '#AEAEAE', marginBottom: 24, width: '100%', fontSize: '20px', + textAlign: 'center', padding: 6, }, }, [ @@ -40,7 +41,7 @@ DisclaimerScreen.prototype.render = function () { .markdown { font-family: Times New Roman; } - .markdown h1,h2,h3,h4 { + .markdown h1, .markdown h2, .markdown h3 { margin: 10px 0; font-family: arial sans-serif; font-weight: bold; diff --git a/ui/app/first-time/disclaimer.txt b/ui/app/first-time/disclaimer.txt deleted file mode 100644 index b7c2cf13e..000000000 --- a/ui/app/first-time/disclaimer.txt +++ /dev/null @@ -1,3 +0,0 @@ -Full disclaimer coming soon. In the meanwhile, be aware this is experimental software. We are not responsible for how you use MetaMask, or any funds that you spend or lose with it. The only way to be absolutely sure you will lose no funds on the internet is to put no funds onto the internet. Enjoy! - - |