aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/main-container.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-03-14 01:46:14 +0800
committerGitHub <noreply@github.com>2018-03-14 01:46:14 +0800
commit572234e383f944eb2be28c4192f209c3972747b7 (patch)
tree3d6a214b845790c96e2c98e6c140ed6724d261e4 /ui/app/main-container.js
parent70f33d47472863e3fce41eff60c1fe078efef7de (diff)
parent1fa5cec2ec784ace2dd8d1afab6c0d8cc195feb5 (diff)
downloadtangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar
tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.gz
tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.bz2
tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.lz
tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.xz
tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.zst
tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.zip
Merge branch 'master' into i3033-responsive-newui-onboarding
Diffstat (limited to 'ui/app/main-container.js')
-rw-r--r--ui/app/main-container.js14
1 files changed, 1 insertions, 13 deletions
diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 292abcc3d..eed4bd164 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -32,19 +32,7 @@ MainContainer.prototype.render = function () {
return h(Settings, {key: 'config'})
default:
log.debug('rendering locked screen')
- contents = {
- component: UnlockScreen,
- style: {
- boxShadow: 'none',
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center',
- background: '#F7F7F7',
- // must force 100%, because lock screen is full-width
- width: '100%',
- },
- key: 'locked',
- }
+ return h('.unlock-screen-container', {}, h(UnlockScreen, { key: 'locked' }))
}
}