From 3a1042d7a94287e3371b1ec250262f3e748567e6 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Wed, 24 Oct 2018 10:46:58 -0400
Subject: [PATCH] conflict in blocks and accounts

---
 embark-ui/src/components/Accounts.js  | 48 ++++++++++++++-------------
 embark-ui/src/components/Blocks.js    |  2 +-
 embark-ui/src/components/Explorer.css | 10 +++---
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/embark-ui/src/components/Accounts.js b/embark-ui/src/components/Accounts.js
index eb0116cfd..4f3524983 100644
--- a/embark-ui/src/components/Accounts.js
+++ b/embark-ui/src/components/Accounts.js
@@ -8,32 +8,34 @@ import CardTitleIdenticon from './CardTitleIdenticon';
 const Accounts = ({accounts}) => (
   <Row>
     <Col>
-      <h1>Accounts</h1>
-      {accounts.map(account => (
-        <Card key={account.address}>
-          <CardHeader>
+      <Card>
+        <CardHeader>
+          <h1>Accounts</h1>
+        </CardHeader>
+        <CardBody>
+          {accounts.map(account => (
+            <div className="explorer-row" key={account.address}>
               <CardTitleIdenticon id={account.address}>Account&nbsp;
                 <Link to={`/embark/explorer/accounts/${account.address}`}>{account.address}</Link>
               </CardTitleIdenticon>
-          </CardHeader>
-          <CardBody>
-            <Row>
-              <Col>
-                <strong>Balance</strong>
-                <div>{account.balance} Ether</div>
-              </Col>
-              <Col>
-                <strong>Tx Count</strong>
-                <div>{account.transactionCount}</div>
-              </Col>
-              <Col>
-                <strong>Index</strong>
-                <div>{account.index}</div>
-              </Col>
-            </Row>
-          </CardBody>
-        </Card>
-      ))}
+              <Row>
+                <Col>
+                  <strong>Balance</strong>
+                  <div>{account.balance} Ether</div>
+                </Col>
+                <Col>
+                  <strong>Tx Count</strong>
+                  <div>{account.transactionCount}</div>
+                </Col>
+                <Col>
+                  <strong>Index</strong>
+                  <div>{account.index}</div>
+                </Col>
+              </Row>
+            </div>
+          ))}
+        </CardBody>
+      </Card>
     </Col>
   </Row>
 );
diff --git a/embark-ui/src/components/Blocks.js b/embark-ui/src/components/Blocks.js
index f57c1387a..0e994ae33 100644
--- a/embark-ui/src/components/Blocks.js
+++ b/embark-ui/src/components/Blocks.js
@@ -37,7 +37,7 @@ const Blocks = ({blocks, showLoadMore, loadMore}) => (
               </Row>
             </div>
           ))}
-          {showLoadMore && <LoadMore loadMore={() => loadMore()} />}
+          {showLoadMore && <LoadMore loadMore={() => loadMore()}/>}
         </CardBody>
       </Card>
     </Col>
diff --git a/embark-ui/src/components/Explorer.css b/embark-ui/src/components/Explorer.css
index d3cb3b64b..352436539 100644
--- a/embark-ui/src/components/Explorer.css
+++ b/embark-ui/src/components/Explorer.css
@@ -1,11 +1,11 @@
-.explorer-row {
-  margin-bottom: 20px;
-  padding-bottom: 5px;
-  border-bottom: 1px solid #c8ced3;
+.explorer-row + .explorer-row {
+  margin-top: 5px;
+  padding-top: 20px;
+  border-top: 1px solid #c8ced3;
 }
 
 .dark-theme .explorer-row {
-  border-bottom-color: #23282c;
+  border-top-color: #23282c;
 }
 
 .explorer-row .text-truncate {