Increase tap areas for menu buttons on mobile

ui/app/components/tx-view.js

@@ -100,9 +100,10 @@ TxView.prototype.render = function () {
 
     h('div.flex-row.phone-visible', {
       style: {
-        margin: '1.5em 1.2em 0',
         justifyContent: 'space-between',
         alignItems: 'center',
+        flex: '0 0 auto',
+        margin: '10px',
       },
     }, [
 
@@ -110,11 +111,10 @@ TxView.prototype.render = function () {
         style: {
           fontSize: '1.3em',
           cursor: 'pointer',
+          padding: '10px',
         },
-        onClick: () => {
+        onClick: () => this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar(),
-          this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
+      }),
-        },
-      }, []),
 
       h('.identicon-wrapper.select-none', {
         style: {

ui/app/css/itcss/components/hero-balance.scss

@@ -5,9 +5,6 @@
     flex-direction: column;
     justify-content: flex-start;
     align-items: center;
-    margin: .3em .9em 0;
-    // height: 80vh;
-    // max-height: 225px;
     flex: 0 0 auto;
   }
 

ui/app/css/itcss/components/newui-sections.scss

@@ -51,6 +51,7 @@ $wallet-view-bg: $alabaster;
   cursor: pointer;
   display: flex;
   justify-content: center;
+  padding: 10px;
 }
 
 // wallet view and sidebar
@@ -313,4 +314,23 @@ $wallet-view-bg: $alabaster;
   @media screen and (min-width: 1281px) {
     width: 62vw;
   }
-}
+}
+
+.unlock-screen-container {
+  z-index: $main-container-z-index;
+  font-family: Roboto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex: 1 0 auto;
+  background: #f7f7f7;
+  width: 100%;
+}
+
+.unlock-screen {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  flex: 1 0 auto;
+}

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 = {
+        return h('.unlock-screen-container', {}, h(UnlockScreen, { key: 'locked' }))
-          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',
-        }
     }
   }
 

ui/app/unlock.js

@@ -28,83 +28,72 @@ UnlockScreen.prototype.render = function () {
   const state = this.props
   const warning = state.warning
   return (
-    h('.flex-column', {
+    h('.unlock-screen', [
-      style: {
+
-        width: 'inherit',
+      h(Mascot, {
-      },
+        animationEventEmitter: this.animationEventEmitter,
-    }, [
+      }),
-      h('.unlock-screen.flex-column.flex-center.flex-grow', [
+
-
+      h('h1', {
-        h(Mascot, {
+        style: {
-          animationEventEmitter: this.animationEventEmitter,
+          fontSize: '1.4em',
-        }),
+          textTransform: 'uppercase',
-
+          color: '#7F8082',
-        h('h1', {
+        },
-          style: {
+      }, 'MetaMask'),
-            fontSize: '1.4em',
+
-            textTransform: 'uppercase',
+      h('input.large-input', {
-            color: '#7F8082',
+        type: 'password',
-          },
+        id: 'password-box',
-        }, 'MetaMask'),
+        placeholder: 'enter password',
-
+        style: {
-        h('input.large-input', {
+          background: 'white',
-          type: 'password',
+        },
-          id: 'password-box',
+        onKeyPress: this.onKeyPress.bind(this),
-          placeholder: 'enter password',
+        onInput: this.inputChanged.bind(this),
-          style: {
+      }),
-            background: 'white',
+
-          },
+      h('.error', {
-          onKeyPress: this.onKeyPress.bind(this),
+        style: {
-          onInput: this.inputChanged.bind(this),
+          display: warning ? 'block' : 'none',
-        }),
+          padding: '0 20px',
-
+          textAlign: 'center',
-        h('.error', {
+        },
-          style: {
+      }, warning),
-            display: warning ? 'block' : 'none',
+
-            padding: '0 20px',
+      h('button.primary.cursor-pointer', {
-            textAlign: 'center',
+        onClick: this.onSubmit.bind(this),
-          },
+        style: {
-        }, warning),
+          margin: 10,
-
+        },
-        h('button.primary.cursor-pointer', {
+      }, 'Log In'),
-          onClick: this.onSubmit.bind(this),
+
-          style: {
+      h('p.pointer', {
-            margin: 10,
+        onClick: () => {
-          },
+          this.props.dispatch(actions.markPasswordForgotten())
-        }, 'Log In'),
+          if (environmentType() === 'popup') {
-      ]),
+            global.platform.openExtensionInBrowser()
-
+          }
-      h('.flex-row.flex-center.flex-grow', [
+        },
-        h('p.pointer', {
+        style: {
-          onClick: () => {
+          fontSize: '0.8em',
-            this.props.dispatch(actions.markPasswordForgotten())
+          color: 'rgb(247, 134, 28)',
-            if (environmentType() === 'popup') {
+          textDecoration: 'underline',
-              global.platform.openExtensionInBrowser()
+        },
-            }
+      }, 'Restore from seed phrase'),
-          },
+
-          style: {
+      h('p.pointer', {
-            fontSize: '0.8em',
+        onClick: () => {
-            color: 'rgb(247, 134, 28)',
+          this.props.dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL'))
-            textDecoration: 'underline',
+            .then(() => this.props.dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE)))
-          },
+        },
-        }, 'Restore from seed phrase'),
+        style: {
-      ]),
+          fontSize: '0.8em',
-
+          color: '#aeaeae',
-      h('.flex-row.flex-center.flex-grow', [
+          textDecoration: 'underline',
-        h('p.pointer', {
+          marginTop: '32px',
-          onClick: () => {
+        },
-            this.props.dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL'))
+      }, 'Use classic interface'),
-              .then(() => this.props.dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE)))
-          },
-          style: {
-            fontSize: '0.8em',
-            color: '#aeaeae',
-            textDecoration: 'underline',
-            marginTop: '32px',
-          },
-        }, 'Use classic interface'),
-      ]),
-
     ])
   )
 }