aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-26 07:05:44 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-26 07:05:44 +0800
commit250cf8cc23305e33f4fc26a1711996ebc54fd9ad (patch)
tree642208ebc1c66e216240650e749c6394284e441b
parent4c46997c4a871569deed45355d79d81e75ab4d3d (diff)
downloadtangerine-wallet-browser-250cf8cc23305e33f4fc26a1711996ebc54fd9ad.tar
tangerine-wallet-browser-250cf8cc23305e33f4fc26a1711996ebc54fd9ad.tar.gz
tangerine-wallet-browser-250cf8cc23305e33f4fc26a1711996ebc54fd9ad.tar.bz2
tangerine-wallet-browser-250cf8cc23305e33f4fc26a1711996ebc54fd9ad.tar.lz
tangerine-wallet-browser-250cf8cc23305e33f4fc26a1711996ebc54fd9ad.tar.xz
tangerine-wallet-browser-250cf8cc23305e33f4fc26a1711996ebc54fd9ad.tar.zst
tangerine-wallet-browser-250cf8cc23305e33f4fc26a1711996ebc54fd9ad.zip
Change style on back button to be more like the rest of the app
-rw-r--r--ui/app/app.js80
1 files changed, 55 insertions, 25 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index b1c258270..7b47732c4 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -299,28 +299,24 @@ App.prototype.renderDropdown = function () {
App.prototype.renderBackToInitButton = function () {
var props = this.props
var button = null
- var backButton = h('.flex-row', {
- key: 'leftArrow',
- transForward: false,
- style: {
- position: 'absolute',
- bottom: '10px',
- left: '8px',
- fontSize: '21px',
- fontFamily: 'Montserrat Light',
- color: '#7F8082',
- width: '71.969px',
- alignItems: 'flex-end',
- },
- }, [
- h('i.fa.fa-arrow-left.cursor-pointer'),
- h('div.cursor-pointer', {
- style: {
- marginLeft: '3px',
- },
- onClick: () => props.dispatch(actions.goBackToInitView()),
- }, 'Back'),
- ])
+ var backButton = function (style, justArrow = false) {
+ return (
+ h('.flex-row', {
+ key: 'leftArrow',
+ transForward: false,
+ style: style,
+ onClick: () => props.dispatch(actions.goBackToInitView()),
+ }, [
+ h('i.fa.fa-arrow-left.cursor-pointer'),
+ justArrow ? null : h('div.cursor-pointer', {
+ style: {
+ marginLeft: '3px',
+ },
+ onClick: () => props.dispatch(actions.goBackToInitView()),
+ }, 'BACK'),
+ ])
+ )
+ }
if (!props.isUnlocked) {
if (props.currentView.name === 'InitMenu') {
button = props.forgottenPassword ? h('.flex-row', {
@@ -328,7 +324,7 @@ App.prototype.renderBackToInitButton = function () {
style: {
position: 'absolute',
bottom: '10px',
- right: '8px',
+ right: '15px',
fontSize: '21px',
fontFamily: 'Montserrat Light',
color: '#7F8082',
@@ -341,11 +337,45 @@ App.prototype.renderBackToInitButton = function () {
marginRight: '3px',
},
onClick: () => props.dispatch(actions.backToUnlockView()),
- }, 'Login'),
+ }, 'LOGIN'),
h('i.fa.fa-arrow-right.cursor-pointer'),
]) : null
} else if (props.isInitialized) {
- button = backButton
+ var style
+ switch (props.currentView.name) {
+ case 'createVault':
+ style = {
+ position: 'absolute',
+ top: '41px',
+ left: '80px',
+ fontSize: '21px',
+ fontFamily: 'Montserrat Bold',
+ color: 'rgb(174, 174, 174)',
+ }
+ return backButton(style, true)
+ case 'restoreVault':
+ style = {
+ position: 'absolute',
+ top: '41px',
+ left: '70px',
+ fontSize: '21px',
+ fontFamily: 'Montserrat Bold',
+ color: 'rgb(174, 174, 174)',
+ }
+ return backButton(style, true)
+ default:
+ style = {
+ position: 'absolute',
+ bottom: '10px',
+ left: '15px',
+ fontSize: '21px',
+ fontFamily: 'Montserrat Light',
+ color: '#7F8082',
+ width: '71.969px',
+ alignItems: 'flex-end',
+ }
+ return backButton(style)
+ }
}
}
return button