diff --git a/shyftBlockExplorerUI/src/components/assets/arrow_right_black.png b/shyftBlockExplorerUI/src/components/assets/arrow_right_black.png new file mode 100644 index 0000000000..0560e2ec1f Binary files /dev/null and b/shyftBlockExplorerUI/src/components/assets/arrow_right_black.png differ diff --git a/shyftBlockExplorerUI/src/components/nav/nav.css b/shyftBlockExplorerUI/src/components/nav/nav.css index ee9d9141d8..25acd33940 100644 --- a/shyftBlockExplorerUI/src/components/nav/nav.css +++ b/shyftBlockExplorerUI/src/components/nav/nav.css @@ -1,5 +1,5 @@ .navHeader { - height: 27.5vh; + height: 150pt; background-color: #4f2e7e; padding-top: 30pt; padding-left: 2.5%; diff --git a/shyftBlockExplorerUI/src/components/nav/nav.js b/shyftBlockExplorerUI/src/components/nav/nav.js index b34ed7e819..fcb2347396 100644 --- a/shyftBlockExplorerUI/src/components/nav/nav.js +++ b/shyftBlockExplorerUI/src/components/nav/nav.js @@ -36,7 +36,6 @@ class navBar extends React.Component { - diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js index 5b2d911c57..741b1668e4 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js +++ b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js @@ -42,7 +42,7 @@ class BlocksTable extends Component { let combinedClasses = ['responsive-table', classes.table]; return ( -
+
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js index 04555a10e0..bc941a4a4d 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js +++ b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js @@ -6,10 +6,10 @@ const BlockTable = (props) => { return ( - - + diff --git a/shyftBlockExplorerUI/src/components/table/blocks/table.css b/shyftBlockExplorerUI/src/components/table/blocks/table.css index 1492932065..867ed44e55 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/table.css +++ b/shyftBlockExplorerUI/src/components/table/blocks/table.css @@ -3,9 +3,9 @@ width: 95%; margin: 0 auto; background-color: white; - top: 20vh; + top: 107pt; left: 2.5%; - position: fixed; + position: absolute; } thead { @@ -28,12 +28,24 @@ td { font-family: 'Open Sans', sans-serif; } +.height { + width: 50px; +} + +.hash { + display: inline-block; + vertical-align: bottom; + text-overflow: ellipsis; + overflow: hidden; + width: 220px; +} + .addressTag { display: inline-block; vertical-align: bottom; text-overflow: ellipsis; overflow: hidden; - width: 100px; + width: 150px; } .ageTag{ diff --git a/shyftBlockExplorerUI/src/components/table/transactions/table.css b/shyftBlockExplorerUI/src/components/table/transactions/table.css index 7b1f0858f0..5ee1680a15 100644 --- a/shyftBlockExplorerUI/src/components/table/transactions/table.css +++ b/shyftBlockExplorerUI/src/components/table/transactions/table.css @@ -1,16 +1,31 @@ .table { border-spacing: 100rem; - width: 100%; - margin-top: 50px; + width: 95%; + margin: 0 auto; + background-color: white; + top: 107pt; + left: 2.5%; + position: absolute; } .tHead { - font-size: 1rem; + font-size: 7pt; + background-color: white; + font-family: 'Open Sans', sans-serif; + color: #593c83; } th { - background-color: aliceblue; - padding-right: 10px; + background-color: white; + padding: 15pt 30pt ; + color: #593c83; + font-family: 'Open Sans', sans-serif; +} + +td { + font-size: 6pt; + background-color: white; + font-family: 'Open Sans', sans-serif; } .addressTag { @@ -18,7 +33,7 @@ th { vertical-align: bottom; text-overflow: ellipsis; overflow: hidden; - width: 132px; + width: 250px; } .ageTag{ @@ -56,7 +71,6 @@ th { .arrow { width: 25px; height: 25px; - margin-left: 15px; } .disabled { diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js index c0d7e617cc..7c537f5cbc 100644 --- a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js +++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js @@ -21,7 +21,6 @@ class TransactionTable extends Component { } } - render() { const table = this.state.data.map((data, i) => { @@ -44,16 +43,16 @@ class TransactionTable extends Component { let combinedClasses = ['responsive-table', classes.table]; return (
props.detailBlockHandler(props.Number)}> + props.detailBlockHandler(props.Number)}> {props.Number} {props.Hash}{props.Hash} {props.AgeGet} {props.TxCount} {props.UncleCount}
- + - - - - - - - - + + + + + + + + {table} diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js index 71ea807e01..54884fc2f1 100644 --- a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js +++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js @@ -1,6 +1,6 @@ import React from 'react'; import classes from './table.css'; -import arrow from '../../assets/arrow_right.png'; +import arrow from '../../assets/arrow_right_black.png'; import { Link } from 'react-router-dom' const TransactionTable = (props) => { @@ -13,18 +13,18 @@ const TransactionTable = (props) => { return ( - - + - - - - - - - + + + + + + + ) diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js index bd6fdb15ed..9dd0a5e979 100644 --- a/shyftBlockExplorerUI/src/containers/App.js +++ b/shyftBlockExplorerUI/src/containers/App.js @@ -97,100 +97,96 @@ class App extends Component { render() { return ( -
- - {/*
*/}
*/} - - - } - /> + + + } + /> - -
- - -
} - /> + +
+ {/* */} + +
} + /> - -
- {/* */} - - - -
} - /> + +
+ {/* */} + + + +
} + /> - -
- - -
} - /> + +
+ + +
} + /> - -
- - -
} - /> + +
+ + +
} + /> - -
- - -
} - /> + +
+ + +
} + /> - -
- - + +
+ + -
} - /> +
} + /> - -
- - -
} - /> + +
+ + +
} + /> - -
- - -
} - /> + +
+ + +
} + />
);
TxHashBlockAgeFromToValueTxFeeTxHashBlockAgeFromToValueTxFee
- props.detailTransactionHandler(props.txHash)}> +
+ props.detailTransactionHandler(props.txHash)}> {props.txHash} props.getBlockTransactions(props.blockNumber)}>{props.blockNumber}{props.age} props.detailAccountHandler(props.from)}>{props.from}arrow props.detailAccountHandler(props.to)}>{props.to}{props.value}{props.cost} props.getBlockTransactions(props.blockNumber)}>{props.blockNumber}{props.age} props.detailAccountHandler(props.from)}>{props.from}arrow props.detailAccountHandler(props.to)}>{props.to}{props.value}{props.cost}