diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-Light.ttf | bin | 0 -> 43940 bytes | |||
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-Light.woff | bin | 0 -> 22964 bytes | |||
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-UltraLight.ttf | bin | 0 -> 67344 bytes | |||
| -rw-r--r-- | app/fonts/Montserrat/Montserrat-UltraLight.woff | bin | 0 -> 29684 bytes | |||
| -rw-r--r-- | app/scripts/metamask-controller.js | 6 | ||||
| -rw-r--r-- | docs/video_script.txt | 18 | ||||
| -rw-r--r-- | ui/app/account-detail.js | 50 | ||||
| -rw-r--r-- | ui/app/css/fonts.css | 17 |
10 files changed, 55 insertions, 41 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e141a920..6bee30518 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## Current Master +- Fix formatting of account details. ## 2.5.0 2016-06-29 @@ -1,4 +1,4 @@ -# Metamask Plugin [](https://circleci.com/gh/MetaMask/metamask-plugin) +# MetaMask Plugin [](https://circleci.com/gh/MetaMask/metamask-plugin) ## Architecture @@ -65,7 +65,7 @@ You can run the linter by itself with `gulp lint`. ### Deploying the UI - You must be authorized already on the Metamask plugin. + You must be authorized already on the MetaMask plugin. 0. Update the version in `app/manifest.json` and the Changelog in `CHANGELOG.md`. 1. Visit [the chrome developer dashboard](https://chrome.google.com/webstore/developer/dashboard?authuser=2). diff --git a/app/fonts/Montserrat/Montserrat-Light.ttf b/app/fonts/Montserrat/Montserrat-Light.ttf Binary files differnew file mode 100644 index 000000000..cd8f62d7e --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-Light.ttf diff --git a/app/fonts/Montserrat/Montserrat-Light.woff b/app/fonts/Montserrat/Montserrat-Light.woff Binary files differnew file mode 100644 index 000000000..d8aa6e103 --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-Light.woff diff --git a/app/fonts/Montserrat/Montserrat-UltraLight.ttf b/app/fonts/Montserrat/Montserrat-UltraLight.ttf Binary files differnew file mode 100644 index 000000000..16d2dbf15 --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-UltraLight.ttf diff --git a/app/fonts/Montserrat/Montserrat-UltraLight.woff b/app/fonts/Montserrat/Montserrat-UltraLight.woff Binary files differnew file mode 100644 index 000000000..156ff32c8 --- /dev/null +++ b/app/fonts/Montserrat/Montserrat-UltraLight.woff diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 470591323..8a5ffb75a 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -89,10 +89,12 @@ module.exports = class MetamaskController { }) function logger (err, request, response) { - if (err) return console.error(err.stack) + if (err) return console.error(err) if (!request.isMetamaskInternal) { console.log(`RPC (${originDomain}):`, request, '->', response) - if (response.error) console.error('Error in RPC response:\n' + response.error.message) + if (response.error) { + console.error('Error in RPC response:\n', response.error) + } } } } diff --git a/docs/video_script.txt b/docs/video_script.txt index bb707b394..1b363324c 100644 --- a/docs/video_script.txt +++ b/docs/video_script.txt @@ -2,26 +2,26 @@ Hi, and welcome to MetaMask. Today we’re happy to share our gift to the Ethereum ecosystem. -The MetaMask browser extension turns an ordinary browser like Chrome into an Ethereum browser, letting websites get data from the blockchain, and letting users securely manage identities and sign transactions. +The MetaMask browser extension turns Google Chrome into an Ethereum browser, letting websites retrieve data from the blockchain, and letting users securely manage identities and sign transactions. When you start up MetaMask, you are given a seed phrase that can be used to restore all the accounts you ever create within MetaMask. You can switch the current account with the switch account button in the top right, and you can add more accounts at the bottom of the account list. -Your account vault is stored encrypted within your browser, and it never touches our servers, but with your secret phrase, you can easily seed a new vault with the same accounts. +Your account vault is encrypted and locally stored within your browser, meaning no account information ever touches our servers. However, with your secret phrase, you can easily restore your vault with the same accounts. -You can send ether from within MetaMask like any wallet, but where MetaMask really shines is how it lets you visit Ethereum enabled websites. +At first glance, Metamask enables you to send ether like a normal wallet application, but Metamask's true strength lies in enabling your browser to visit Ethereum enabled websites. Here’s a simple Ethereum distributed app, or Ðapp, called Tokens, that lets you easily deploy your own currency. -When you visit a Dapp like Tokens with MetaMask installed, that website has access to the Ethereum blockchain via the standard Web3 Javascript API, and when it wants to write to the blockchain, it just asks web3 to send the transaction, and MetaMask asks for the user’s permission first. +When you visit a Dapp like Tokens with MetaMask installed, that website has access to the Ethereum blockchain via the standard Web3 Javascript API. When it wants to write to the blockchain, it asks web3 to send the transaction, prompting MetaMask to ask for user confirmation. -After you submit a transaction, you have to wait for the next block for the change to be reflected on the website, and there it is! +After you submit a transaction, wait for the next block for the change to be reflected on the website...and there it is! -Now I have my own MetaMaskCoins! I can check my balance, or if I want to send some to another account, I can click the copy link on it, and then check its balance, see it has none, then send it some meta-coins! +Now I have my own MetaMaskCoins! I can check my balance or, if I want to send some to another account, I can click the copy link on it. I check its balance, see it has none, then send it some meta-coins! -And this has been nice, but it’s all been on the test-net. I can always switch what blockchain I’m working on to the main-net, and I’m ready issue a token with the full security of the Ethereum blockchain. +This has been nice, but it’s all been on the test-net. I can always switch what blockchain I’m working on, say the main blockhain, and I’m ready issue a token with the full security of the Ethereum blockchain. -MetaMask connects to these blockchains with no synchronization time, because we host blockchain nodes by default, but you can always point MetaMask at your own Ethereum RPC Server, and fully control your connection to the blockchain. +MetaMask connects to these blockchains with no synchronization time because we host blockchain nodes by default. You can always point MetaMask at your own Ethereum RPC Server, and fully control your connection to the blockchain. -So that’s how MetaMask lets ordinary websites talk to a trusted Ethereum provider, while letting the user store and manage their own private keys. We hope this will help enable a new wave of blockchain-enabled websites.
\ No newline at end of file +And that’s how MetaMask lets ordinary websites talk to a trusted Ethereum provider, all while letting the user store and manage their own private keys. We hope this will help enable a new wave of blockchain-enabled websites. diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index aae1d434f..62b9d80ae 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -56,7 +56,7 @@ AccountDetailScreen.prototype.render = function () { // header - identicon + nav h('div', { style: { - marginTop: '15px', + marginTop: '20px', display: 'flex', justifyContent: 'flex-start', alignItems: 'flex-start', @@ -107,7 +107,7 @@ AccountDetailScreen.prototype.render = function () { paddingTop: '3px', width: '5em', fontSize: '13px', - fontFamily: 'Montserrat Thin', + fontFamily: 'Montserrat Light', textRendering: 'geometricPrecision', marginTop: '10px', marginBottom: '15px', @@ -120,6 +120,8 @@ AccountDetailScreen.prototype.render = function () { h('.flex-row', { style: { justifyContent: 'flex-end', + position: 'relative', + bottom: '15px', }, }, [ h(CopyButton, { @@ -150,31 +152,31 @@ AccountDetailScreen.prototype.render = function () { // account ballence - h('.flex-row', { - style: { - justifyContent: 'space-between', - alignItems: 'flex-start', - }, - }, [ - - h(EtherBalance, { - value: account && account.balance, - style: { - lineHeight: '7px', - }, - }), + ]), + ]), + h('.flex-row', { + style: { + justifyContent: 'space-between', + alignItems: 'flex-start', + }, + }, [ - h('button', { - onClick: () => props.dispatch(actions.showSendPage()), - style: { - marginBottom: '20px', - marginRight: '8px', - }, - }, 'SEND'), + h(EtherBalance, { + value: account && account.balance, + style: { + lineHeight: '7px', + marginTop: '10px', + }, + }), - ]), + h('button', { + onClick: () => props.dispatch(actions.showSendPage()), + style: { + marginBottom: '20px', + marginRight: '8px', + }, + }, 'SEND'), - ]), ]), ]), diff --git a/ui/app/css/fonts.css b/ui/app/css/fonts.css index da024ce84..3b9f581b9 100644 --- a/ui/app/css/fonts.css +++ b/ui/app/css/fonts.css @@ -20,8 +20,17 @@ } @font-face { - font-family: 'Montserrat Thin'; - src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff'); - src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype'); - text-rendering: geometricPrecision; + font-family: 'Montserrat Light'; + src: url('/fonts/Montserrat/Montserrat-Light.woff') format('woff'); + src: url('/fonts/Montserrat/Montserrat-Light.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Montserrat UltraLight'; + src: url('/fonts/Montserrat/Montserrat-UltraLight.woff') format('woff'); + src: url('/fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype'); + font-weight: normal; + font-style: normal; } |