m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording

Browse Source 
Replace Lock wording with Log Out / Log In
This commit is contained in:
kumavis 2018-03-06 17:12:32 -08:00 committed by GitHub
commit 8e0131cbb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## Current Master ## Current Master
- Replace "Unlock" wording with "Log In".
- Allow adding custom tokens to classic ui when balance is 0 - Allow adding custom tokens to classic ui when balance is 0
- Allow editing of symbol and decimal info when adding custom token in new-ui - Allow editing of symbol and decimal info when adding custom token in new-ui
- new-ui shapeshift form can select all coins (not just BTC) - new-ui shapeshift form can select all coins (not just BTC)

2
old-ui/app/unlock.js
View File

@ -69,7 +69,7 @@ UnlockScreen.prototype.render = function () {
style: { style: {
margin: 10, margin: 10,
}, },
}, 'Unlock'), }, 'Log In'),
]), ]),
h('.flex-row.flex-center.flex-grow', [ h('.flex-row.flex-center.flex-grow', [

4
ui/app/unlock.js
View File

@ -71,7 +71,7 @@ UnlockScreen.prototype.render = function () {
style: { style: {
margin: 10, margin: 10,
}, },
}, 'Unlock'), }, 'Log In'),
]), ]),
h('.flex-row.flex-center.flex-grow', [ h('.flex-row.flex-center.flex-grow', [
@ -104,7 +104,7 @@ UnlockScreen.prototype.render = function () {
}, },
}, 'Use classic interface'), }, 'Use classic interface'),
]), ]),
]) ])
) )
} }