Merge pull request #486 from LiskHQ/459-header-disappears-on-small-sc…

…reens Header disappears on small screens - Closes #459
LiskHQ · Feb 28, 2018 · e1b0adf · e1b0adf
2 parents bfc94e4 + 15e9a2b
commit e1b0adf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/components/dashboard/index.js b/src/components/dashboard/index.js
@@ -14,7 +14,7 @@ class Dashboard extends React.Component {
   render() {
     const { transactions, t } = this.props;
     return <div className={`${grid.row} ${styles.wrapper}`}>
-      <div className={`${grid['col-md-8']} ${grid['col-xs-12']} ${styles.colHack}`}>
+      <div className={`${grid['col-md-8']} ${grid['col-xs-12']} ${styles.main}`}>
         <Box className={`${styles.graph}`}>
           <CurrencyGraph />
         </Box>

diff --git a/src/components/dashboard/styles.css b/src/components/dashboard/styles.css
@@ -4,6 +4,11 @@
   width: 100%;
 }
 
+.main {
+  max-height: 75vh; /* stylelint-disable-line */
+  overflow: auto;
+}
+
 .seeAllLink {
   font-size: 15px;
   color: var(--color-primary-standard);
@@ -49,7 +54,7 @@
 
 @media (--medium-viewport) {
   .wrapper {
-    & .colHack {
+    & .main {
       padding: 0;
       max-width: 100%;
       flex-basis: 100%;

diff --git a/src/components/send/index.js b/src/components/send/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import { translate } from 'react-i18next';
 
 import { FontIcon } from '../fontIcon';
@@ -28,7 +28,7 @@ class Send extends React.Component {
   render() {
     const { t } = this.props;
     return (
-      <div>
+      <Fragment>
         <span className={styles.mobileMenu}>
           <span className={`send-menu-item ${styles.mobileMenuItem}`}
             onClick={this.setSendIsActive.bind(this, true)}>
@@ -51,7 +51,7 @@ class Send extends React.Component {
             <ResultBox />
           </MultiStep>
         </Box>
-      </div>
+      </Fragment>
     );
   }
 }