Merge branch 'master' into jg-signer-decoding

js/src/views/Account/account.js

@@ -51,8 +51,6 @@ class Account extends Component {
     balances: PropTypes.object
   }
 
-  propName = null
-
   state = {
     showDeleteDialog: false,
     showEditDialog: false,

js/src/views/Application/TabBar/tabBar.css

@@ -65,7 +65,7 @@ button.tabactive:hover {
 
 .logo {
   margin: 0 0 0 -24px;
-  padding: 22px 24px 0 24px;
+  padding: 20px 24px;
   white-space: nowrap;
 }
 
@@ -84,6 +84,6 @@ button.tabactive:hover {
 
 .last {
   margin: 0 -24px 0 0;
-  padding: 22px 12px 0 12px;
+  padding: 36px 12px;
   white-space: nowrap;
 }

js/src/views/Application/application.css

@@ -15,13 +15,8 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-.outer,
 .container {
-  min-height: 100vh;
   display: flex;
   flex-direction: column;
-}
-
-.container {
-  padding-bottom: 1.6em;
+  min-height: 100vh;
 }

js/src/views/Application/application.js

@@ -30,8 +30,6 @@ import Status from './Status';
 import Store from './store';
 import TabBar from './TabBar';
 
-import styles from './application.css';
-
 const inFrame = window.parent !== window && window.parent.frames.length !== 0;
 
 @observer
@@ -62,7 +60,7 @@ class Application extends Component {
     }
 
     return (
-      <div className={ styles.outer }>
+      <div>
         { isDapp ? this.renderDapp() : this.renderApp() }
         <Connection />
         <ParityBar dapp={ isDapp } />