diff --git a/notices/archive/notice_0.md b/notices/archive/notice_0.md index 361a3c7fd..fd9dff4af 100644 --- a/notices/archive/notice_0.md +++ b/notices/archive/notice_0.md @@ -1,7 +1,3 @@ ## Related Links ## -**[Terms of Use](https://github.com/poanetwork/metamask-extension/wiki)** - -**[Privacy](https://github.com/poanetwork/metamask-extension/wiki)** - -**[Attributions](https://github.com/poanetwork/metamask-extension/wiki)** +**[Terms of Service](https://github.com/poanetwork/metamask-extension/wiki/Terms-of-Service)** diff --git a/old-ui/app/accounts/import/index.js b/old-ui/app/accounts/import/index.js index 975607bfa..e6b5cc68e 100644 --- a/old-ui/app/accounts/import/index.js +++ b/old-ui/app/accounts/import/index.js @@ -34,7 +34,11 @@ AccountImportSubview.prototype.render = function () { const { type } = state return ( - h('div', [ + h('div', { + style: { + width: '100%', + }, + }, [ h('.section-title.flex-row.flex-center', [ h('i.fa.fa-arrow-left.fa-lg.cursor-pointer.color-violet', { onClick: (event) => { @@ -47,26 +51,14 @@ AccountImportSubview.prototype.render = function () { style: { display: 'inline-block', alignItems: 'center', - padding: '5px 15px 0px 15px', + padding: '5px 30px 0px 30px', }, }, [ - h('span', 'Imported accounts will not be associated with your originally created Nifty Wallet account seedphrase. Learn more about imported accounts '), - h('span', { - style: { - color: '#60db97', - cursor: 'pointer', - textDecoration: 'underline', - }, - onClick: () => { - global.platform.openWindow({ - url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts', - }) - }, - }, 'here.'), + h('span', 'Imported accounts will not be associated with your originally created Nifty Wallet account seedphrase.'), ]), h('div', { style: { - padding: '10px', + padding: '10px 30px', }, }, [ diff --git a/old-ui/app/accounts/import/json.js b/old-ui/app/accounts/import/json.js index a6690a83a..1ac24d982 100644 --- a/old-ui/app/accounts/import/json.js +++ b/old-ui/app/accounts/import/json.js @@ -5,8 +5,6 @@ const actions = require('../../../../ui/app/actions') const FileInput = require('react-simple-file-input').default const PropTypes = require('prop-types') -const HELP_LINK = 'https://github.com/MetaMask/faq/blob/master/README.md#q-i-cant-use-the-import-feature-for-uploading-a-json-file-the-window-keeps-closing-when-i-try-to-select-a-file' - class JsonImportSubview extends Component { constructor (props) { super(props) @@ -31,10 +29,6 @@ class JsonImportSubview extends Component { }, [ h('p', 'Used by a variety of different clients'), - h('a.warning', { - href: HELP_LINK, - target: '_blank', - }, 'File import not working? Click here!'), h(FileInput, { readAs: 'text', @@ -51,7 +45,7 @@ class JsonImportSubview extends Component { id: 'json-password-box', onKeyPress: this.createKeyringOnEnter.bind(this), style: { - width: 260, + width: '100%', marginTop: 12, border: '1px solid #e2e2e2', }, @@ -60,7 +54,7 @@ class JsonImportSubview extends Component { h('button', { onClick: this.createNewKeychain.bind(this), style: { - margin: 12, + margin: 20, }, }, 'Import'), diff --git a/old-ui/app/accounts/import/private-key.js b/old-ui/app/accounts/import/private-key.js index 0146926ed..df8cf33a6 100644 --- a/old-ui/app/accounts/import/private-key.js +++ b/old-ui/app/accounts/import/private-key.js @@ -26,7 +26,7 @@ PrivateKeyImportView.prototype.render = function () { display: 'flex', flexDirection: 'column', alignItems: 'center', - padding: '5px 15px 0px 15px', + padding: '5px 30px 0px 30px', }, }, [ h('span', 'Paste your private key string here'), @@ -36,7 +36,7 @@ PrivateKeyImportView.prototype.render = function () { id: 'private-key-box', onKeyPress: this.createKeyringOnEnter.bind(this), style: { - width: 260, + width: '100%', marginTop: 12, border: '1px solid #e2e2e2', }, @@ -45,7 +45,7 @@ PrivateKeyImportView.prototype.render = function () { h('button', { onClick: this.createNewKeychain.bind(this), style: { - margin: 12, + margin: 20, }, }, 'Import'), diff --git a/old-ui/app/add-token.js b/old-ui/app/add-token.js index aea4292d0..b6bb5b875 100644 --- a/old-ui/app/add-token.js +++ b/old-ui/app/add-token.js @@ -73,16 +73,9 @@ AddTokenScreen.prototype.render = function () { h('div', [ h(Tooltip, { position: 'top', - title: 'The contract of the actual token contract. Click for more info.', + title: 'The contract of the actual token contract.', }, [ - h('a', { - style: { fontWeight: 'bold', paddingRight: '10px'}, - href: 'https://support.metamask.io/kb/article/24-what-is-a-token-contract-address', - target: '_blank', - }, [ - h('span', 'Token Contract Address '), - h('i.fa.fa-question-circle'), - ]), + h('span', 'Token Contract Address '), ]), ]), @@ -98,6 +91,7 @@ AddTokenScreen.prototype.render = function () { margin: '10px 0', borderRadius: '3px', border: '1px solid #e2e2e2', + padding: '10px', }, }), ]), @@ -119,6 +113,7 @@ AddTokenScreen.prototype.render = function () { margin: '10px 0', borderRadius: '3px', border: '1px solid #e2e2e2', + padding: '10px', }, onChange: (event) => { var element = event.target @@ -147,6 +142,7 @@ AddTokenScreen.prototype.render = function () { margin: '10px 0', borderRadius: '3px', border: '1px solid #e2e2e2', + padding: '10px', }, onChange: (event) => { var element = event.target @@ -160,6 +156,7 @@ AddTokenScreen.prototype.render = function () { style: { alignSelf: 'center', float: 'right', + marginTop: '10px', }, onClick: (event) => { const valid = this.validateInputs() diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 2c80af08a..853cd3de9 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -102,7 +102,7 @@ App.prototype.render = function () { overflow: 'hidden', position: 'relative', alignItems: 'center', - background: (props.isUnlocked || props.currentView.name == 'restoreVault') ? 'white' : 'linear-gradient(rgb(84, 36, 147), rgb(104, 45, 182))', + background: (props.isUnlocked || props.currentView.name === 'restoreVault') ? 'white' : 'linear-gradient(rgb(84, 36, 147), rgb(104, 45, 182))', }, }, [ @@ -116,7 +116,7 @@ App.prototype.render = function () { // panel content h('.app-primary' + (transForward ? '.from-right' : '.from-left'), { style: { - background: (props.isUnlocked || props.currentView.name == 'restoreVault') ? 'white' : 'transparent', + background: (props.isUnlocked || props.currentView.name === 'restoreVault') ? 'white' : 'transparent', }, }, [ this.renderPrimary(), diff --git a/old-ui/app/components/account-export.js b/old-ui/app/components/account-export.js index 1c9d3f44a..fe6065b21 100644 --- a/old-ui/app/components/account-export.js +++ b/old-ui/app/components/account-export.js @@ -68,6 +68,7 @@ ExportAccountView.prototype.render = function () { top: '27px', marginBottom: '20px', width: '100%', + padding: '10px', }, }), ]), diff --git a/old-ui/app/components/coinbase-form.js b/old-ui/app/components/coinbase-form.js index b9e7bd23e..f675e91aa 100644 --- a/old-ui/app/components/coinbase-form.js +++ b/old-ui/app/components/coinbase-form.js @@ -23,8 +23,7 @@ CoinbaseForm.prototype.render = function () { return h('.flex-column', { style: { - marginTop: '35px', - padding: '25px', + marginTop: '30px', width: '100%', }, }, [ diff --git a/old-ui/app/components/notice.js b/old-ui/app/components/notice.js index 77c8fcd91..44a558548 100644 --- a/old-ui/app/components/notice.js +++ b/old-ui/app/components/notice.js @@ -14,7 +14,7 @@ function Notice () { Notice.prototype.render = function () { const { notice, onConfirm } = this.props - const { title, date, body } = notice + const { title, body } = notice const state = this.state || { disclaimerDisabled: false } const disabled = state.disclaimerDisabled diff --git a/old-ui/app/components/token-list.js b/old-ui/app/components/token-list.js index 6d05275ba..1c1204b56 100644 --- a/old-ui/app/components/token-list.js +++ b/old-ui/app/components/token-list.js @@ -125,8 +125,6 @@ TokenList.prototype.renderTokenStatusBar = function () { }, style: { display: 'flex', - height: '40px', - padding: '10px', justifyContent: 'center', alignItems: 'center', }, diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js index 5ca04eb0a..bb0594d32 100644 --- a/old-ui/app/conf-tx.js +++ b/old-ui/app/conf-tx.js @@ -42,7 +42,7 @@ function ConfirmTxScreen () { ConfirmTxScreen.prototype.render = function () { const props = this.props - const { network, provider, unapprovedTxs, currentCurrency, computedBalances, + const { network, unapprovedTxs, currentCurrency, computedBalances, unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, blockGasLimit } = props let { conversionRate } = props diff --git a/old-ui/app/config.js b/old-ui/app/config.js index eb05a5803..1e14653bf 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -80,6 +80,9 @@ ConfigScreen.prototype.render = function () { flex: '1 0 auto', height: '32px', margin: '20px 20px 0 0', + borderRadius: '3px', + border: '1px solid #e2e2e2', + padding: '10px', }, onKeyPress (event) { if (event.key === 'Enter') { @@ -120,8 +123,9 @@ ConfigScreen.prototype.render = function () { }, [ h('p', { style: { - fontFamily: 'Nunito Light', - fontSize: '13px', + fontFamily: 'Nunito Regular', + fontSize: '14px', + lineHeight: '18px', }, }, `State logs contain your public account addresses and sent transactions.`), h('br'), @@ -177,8 +181,9 @@ ConfigScreen.prototype.render = function () { h('p', { style: { - fontFamily: 'Nunito Light', - fontSize: '13px', + fontFamily: 'Nunito Regular', + fontSize: '14px', + lineHeight: '18px', }, }, [ 'Resetting is for developer use only. ', diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css index 621757426..1bab94640 100644 --- a/old-ui/app/css/index.css +++ b/old-ui/app/css/index.css @@ -74,7 +74,9 @@ button, input[type="submit"] { font-family: 'Nunito Bold'; outline: none; cursor: pointer; - padding: 8px 15px; + padding-left: 15px; + padding-right: 15px; + height: 32px; border: none; color: white; transform-origin: center center; @@ -142,7 +144,7 @@ button.primary { box-shadow: 0px 3px 6px rgba(247, 134, 28, 0.36); color: white; font-size: 1.1em; - font-family: 'Montserrat Regular'; + font-family: 'Nunito Regular'; text-transform: none; } @@ -378,6 +380,10 @@ app sections } .editable-label{ display: flex; + margin-bottom: 10px; +} +.editable-button{ + margin-left: 10px; } /* Webkit */ .unlock-screen input::-webkit-input-placeholder { @@ -402,8 +408,11 @@ app sections input.large-input, textarea.large-input { /*margin-bottom: 24px;*/ - padding: 8px; + padding: 10px; border-radius: 3px; + border: 1px solid #e2e2e2; + font-family: 'Nunito Regular'; + font-size: 14px; } input.large-input { @@ -596,19 +605,12 @@ input.large-input { color: #ABA9AA; } -/* Info screen */ -.info-gray{ - font-family: 'Montserrat Regular'; - text-transform: uppercase; - color: #AEAEAE; -} - .icon-size{ width: 20px; } .info{ - font-family: 'Montserrat Regular', Arial; + font-family: 'Nunito Regular'; padding-bottom: 10px; display: inline-block; padding-left: 5px; @@ -670,7 +672,7 @@ input.large-input { } .buy-inputs{ - font-family: 'Montserrat Light'; + font-family: 'Nunito Light'; font-size: 13px; height: 20px; background: transparent; @@ -715,7 +717,7 @@ input.large-input { } .ex-coins { - font-family: 'Montserrat Regular'; + font-family: 'Nunito Regular'; text-transform: uppercase; text-align: center; font-size: 33px; @@ -726,7 +728,7 @@ input.large-input { } .marketinfo{ - font-family: 'Montserrat light'; + font-family: 'Nunito light'; color: #AEAEAE; font-size: 15px; line-height: 17px; diff --git a/old-ui/app/info.js b/old-ui/app/info.js index d3213ced1..f43839300 100644 --- a/old-ui/app/info.js +++ b/old-ui/app/info.js @@ -49,7 +49,7 @@ InfoScreen.prototype.render = function () { }, [ // current version number - h('.info.info-gray', [ + h('.info', [ h('div', 'Nifty Wallet'), h('div', { style: { diff --git a/old-ui/app/keychains/hd/recover-seed/confirmation.js b/old-ui/app/keychains/hd/recover-seed/confirmation.js index 14f558460..cf6dec88f 100644 --- a/old-ui/app/keychains/hd/recover-seed/confirmation.js +++ b/old-ui/app/keychains/hd/recover-seed/confirmation.js @@ -27,14 +27,14 @@ RevealSeedConfirmation.prototype.render = function () { style: { maxWidth: '420px' }, }, [ - h('h3.flex-center.text-transform-uppercase', { + h('h3.flex-center', { style: { - background: '#EBEBEB', - color: '#AEAEAE', - marginBottom: 24, + background: '#ffffff', + color: '#333333', width: '100%', - fontSize: '20px', + fontSize: '16px', padding: 6, + fontFamily: 'Nunito Semibold', }, }, [ 'Reveal Seed Words', @@ -44,7 +44,7 @@ RevealSeedConfirmation.prototype.render = function () { style: { display: 'flex', flexDirection: 'column', - padding: '20px', + padding: '30px', justifyContent: 'center', }, }, [ @@ -58,15 +58,26 @@ RevealSeedConfirmation.prototype.render = function () { placeholder: 'Enter your password to confirm', onKeyPress: this.checkConfirmation.bind(this), style: { - width: 260, - marginTop: '12px', + marginTop: '20px', }, }), - h('.flex-row.flex-start', { + (props.warning) && ( + h('span.error', { + style: { + margin: '20px', + }, + }, props.warning.split('-')) + ), + + props.inProgress && ( + h('span.in-progress-notification', 'Generating Seed...') + ), + + h('.flex-row.flex-start.flex-right', { style: { - marginTop: 30, - width: '50%', + marginTop: 20, + width: '100%', }, }, [ // cancel @@ -81,18 +92,6 @@ RevealSeedConfirmation.prototype.render = function () { }, 'Ok'), ]), - - (props.warning) && ( - h('span.error', { - style: { - margin: '20px', - }, - }, props.warning.split('-')) - ), - - props.inProgress && ( - h('span.in-progress-notification', 'Generating Seed...') - ), ]), ]) )