diff --git a/src/components/account/account.css b/src/components/account/account.css index 83f0cb34e..05b332415 100644 --- a/src/components/account/account.css +++ b/src/components/account/account.css @@ -69,6 +69,13 @@ font-weight: 500; letter-spacing: 0; margin-top: 0; + margin-top: 20px; margin-bottom: 16px; text-align: center; } + +@media only screen and (min-width: 48em) { + .title { + margin-top: 0; + } +} diff --git a/src/components/account/account.js b/src/components/account/account.js index 18410b854..928e2a52d 100644 --- a/src/components/account/account.js +++ b/src/components/account/account.js @@ -15,45 +15,57 @@ const Account = ({ account, peers, }) => { const status = (peers.status && peers.status.online) ? - check - : error; + check : + error; return (
-
+
-
+
-

Peer

-
- - {status} - -

- {peers.data.options.name} -

-

- {peers.data.currentPeer} - : {peers.data.port} -

+
+
+

Peer

+
+
+
+ + {status} + +

+ {peers.data.options.name} +

+

+ {peers.data.currentPeer} + : {peers.data.port} +

+
+
-
+
-

Balance

- -
-

- LSK -

-

- Click to send all funds -

+
+
+

Balance

- +
+ +
+

+ LSK +

+

+ Click to send all funds +

+
+
+
+
diff --git a/src/components/account/address.js b/src/components/account/address.js index c1a2ac5d1..679c92a57 100644 --- a/src/components/account/address.js +++ b/src/components/account/address.js @@ -1,4 +1,5 @@ import React from 'react'; +import grid from 'flexboxgrid/dist/flexboxgrid.css'; import styles from './account.css'; const Address = (props) => { @@ -18,9 +19,15 @@ const Address = (props) => { return (
-

{title}

-
- {content} +
+
+

{title}

+
+
+
+ {content} +
+
); diff --git a/src/components/app/app.css b/src/components/app/app.css index 5706a32a6..1bf108394 100644 --- a/src/components/app/app.css +++ b/src/components/app/app.css @@ -10,7 +10,7 @@ body{ } .body-wrapper { flex: 1 1 80%; - max-width: 80%; + max-width: 100%; max-height: 100%; box-sizing: border-box; margin: 0 auto; @@ -40,3 +40,7 @@ body{ :global .hasPaddingRow{ padding: 0 16px; } + +:global .verticalScroll { + overflow-x: auto; +} diff --git a/src/components/app/index.js b/src/components/app/index.js index a750ab566..4c5469005 100644 --- a/src/components/app/index.js +++ b/src/components/app/index.js @@ -1,5 +1,6 @@ import React from 'react'; import { Route } from 'react-router-dom'; +import grid from 'flexboxgrid/dist/flexboxgrid.css'; import PrivateRoutes from '../privateRoute'; import Account from '../account'; import Header from '../header'; @@ -14,23 +15,25 @@ import Tabs from '../tabs'; import LoadingBar from '../loadingBar'; const App = () => ( -
-
-
- ( -
- - - - - -
- )} /> - -
- - - +
+
+
+
+ ( +
+ + + + + +
+ )} /> + +
+ + + +
); diff --git a/src/components/forging/delegateStats.js b/src/components/forging/delegateStats.js index 19a5654e8..78a573a84 100644 --- a/src/components/forging/delegateStats.js +++ b/src/components/forging/delegateStats.js @@ -29,7 +29,7 @@ const progressCircleCardList = [ const DelegateStats = props => (
{progressCircleCardList.map(cardItem => ( -
+
diff --git a/src/components/forging/forging.css b/src/components/forging/forging.css index e455602da..85a872491 100644 --- a/src/components/forging/forging.css +++ b/src/components/forging/forging.css @@ -11,6 +11,7 @@ .forgedBlocksTableWrapper { margin: 0 -8px; + overflow-x: auto; } .circularProgressTitle { diff --git a/src/components/forging/forgingStats.js b/src/components/forging/forgingStats.js index 2e90dda21..b816a5c48 100644 --- a/src/components/forging/forgingStats.js +++ b/src/components/forging/forgingStats.js @@ -36,7 +36,7 @@ class ForgingStats extends React.Component { return (
{statCardObjects.map(cardObj => ( -
+
diff --git a/src/components/header/header.css b/src/components/header/header.css index 7be59dbe2..ffadf838a 100644 --- a/src/components/header/header.css +++ b/src/components/header/header.css @@ -1,11 +1,15 @@ .wrapper{ - margin: 5px -8px 16px 0; + margin: 5px -8px 8px 0; padding: 8px; } -.logo{ +.logoWrapper { width: 25%; - min-width: 128px; - max-width: 256px; +} +.logo{ + width: 100%; + min-width: 108px; + max-width: 200px; + padding: 8px; } .button, .iconButton{ padding: 8px; diff --git a/src/components/header/headerElement.js b/src/components/header/headerElement.js index 173b14cf6..31b184055 100644 --- a/src/components/header/headerElement.js +++ b/src/components/header/headerElement.js @@ -1,6 +1,7 @@ import React from 'react'; import { Button } from 'react-toolbox/lib/button'; import { IconMenu, MenuItem } from 'react-toolbox/lib/menu'; +import grid from 'flexboxgrid/dist/flexboxgrid.css'; import logo from '../../assets/images/LISK-nano.png'; import styles from './header.css'; import VerifyMessage from '../signVerify/verifyMessage'; @@ -11,8 +12,10 @@ import PrivateWrapper from '../privateWrapper'; import SecondPassphraseMenu from '../secondPassphrase'; const HeaderElement = props => ( -
- logo +
+
+ logo +
( title: 'Send', childComponent: Send, })}>Send - +
); diff --git a/src/components/transactions/transactionRow.js b/src/components/transactions/transactionRow.js index fed527a63..12e0b4845 100644 --- a/src/components/transactions/transactionRow.js +++ b/src/components/transactions/transactionRow.js @@ -14,7 +14,7 @@ const TransactionRow = props => ( : } - + {props.value.id} diff --git a/src/components/transactions/transactions.css b/src/components/transactions/transactions.css index 1bdf21308..581a3de36 100644 --- a/src/components/transactions/transactions.css +++ b/src/components/transactions/transactions.css @@ -35,3 +35,9 @@ .centerText{ text-align: center; } + +@media screen and (max-width: 48em) { + .hiddenXs { + display: none; + } +} diff --git a/src/components/transactions/transactionsComponent.js b/src/components/transactions/transactionsComponent.js index e4c0df60d..87e0ea372 100644 --- a/src/components/transactions/transactionsComponent.js +++ b/src/components/transactions/transactionsComponent.js @@ -26,7 +26,7 @@ class Transactions extends React.Component { render() { return ( -
+
{this.props.transactions.length > 0 ? diff --git a/src/components/transactions/transactionsHeader.js b/src/components/transactions/transactionsHeader.js index ea89930ec..81fcdccbf 100644 --- a/src/components/transactions/transactionsHeader.js +++ b/src/components/transactions/transactionsHeader.js @@ -5,7 +5,7 @@ const TransactionsHeader = ({ tableStyle }) => ( - + diff --git a/src/components/voting/voting.js b/src/components/voting/voting.js index 7177dbddf..7ee49ac89 100644 --- a/src/components/voting/voting.js +++ b/src/components/voting/voting.js @@ -159,19 +159,21 @@ class Voting extends React.Component { votedDelegates={this.state.votedDelegates} search={ value => this.search(value) } /> -
TimeTransaction IDTransaction ID From / To Amount
- - Vote - Rank - Name - Lisk Address - Uptime - Approval - - {this.state.delegates.map((item, idx) => ( +
+
+ + Vote + Rank + Name + Lisk Address + Uptime + Approval + + {this.state.delegates.map((item, idx) => ( - ))} -
+ ))} + +
{this.state.notFound}