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 }) => (
Time |
- Transaction ID |
+ Transaction ID |
From / To |
|
Amount |
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) }
/>
-
-
- 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}
|