embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict in explorer layout

This commit is contained in:
Jonathan Rainville 2018-10-24 10:52:53 -04:00
parent 3a1042d7a9
commit 28a1303adf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embark-ui/src/components/Accounts.js
View File

@ -10,7 +10,7 @@ const Accounts = ({accounts}) => (
<Col>
<Card>
<CardHeader>
<h1>Accounts</h1>
<h2>Accounts</h2>
</CardHeader>
<CardBody>
{accounts.map(account => (

2
embark-ui/src/components/Blocks.js
View File

@ -11,7 +11,7 @@ const Blocks = ({blocks, showLoadMore, loadMore}) => (
<Col>
<Card>
<CardHeader>
<h1>Blocks</h1>
<h2>Blocks</h2>
</CardHeader>
<CardBody>
{blocks.map(block => (

2
embark-ui/src/components/ExplorerDashboardLayout.js
View File

@ -12,7 +12,7 @@ import './Explorer.css';
const ExplorerDashboardLayout = () => (
<React.Fragment>
<Row>
<Row className="mt-4">
<Col>
<AccountsContainer />
</Col>

4
embark-ui/src/components/Transactions.js
View File

@ -11,7 +11,7 @@ const Transactions = ({transactions, showLoadMore, loadMore}) => (
<Col>
<Card>
<CardHeader>
<h1>Transactions</h1>
<h2>Transactions</h2>
</CardHeader>
<CardBody>
{transactions.map(transaction => (
@ -41,7 +41,7 @@ const Transactions = ({transactions, showLoadMore, loadMore}) => (
</Row>
</div>
))}
{showLoadMore && <LoadMore loadMore={() => loadMore()} />}
{showLoadMore && <LoadMore loadMore={() => loadMore()}/>}
</CardBody>
</Card>
</Col>