status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-01-23 13:48:49 +00:00
Code Issues Projects Releases Wiki Activity

conflict in css

Browse Source
This commit is contained in:
Jonathan Rainville 2018-10-24 14:50:07 -04:00
parent 6c92e7b24d
commit a1b18b74f8
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embark-ui/src/components/Explorer.css
View File

@ -1,5 +1,9 @@
.explorer-row { .explorer-row {
border-top-width: 0 !important; /*Bootstrap uses important, so we need to override it*/ border-top-width: 0 !important; /*Bootstrap uses important, so we need to override it*/
}
.explorer-overview .card-body {
overflow: hidden;
} }
.explorer-row + .explorer-row { .explorer-row + .explorer-row {

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

@ -11,21 +11,21 @@ import TransactionsContainer from '../containers/TransactionsContainer';
import './Explorer.css'; import './Explorer.css';
const ExplorerDashboardLayout = () => ( const ExplorerDashboardLayout = () => (
<React.Fragment> <div className="explorer-overview">
<Row className="mt-4"> <Row className="mt-4">
<Col> <Col>
<AccountsContainer /> <AccountsContainer />
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col md={6}> <Col xl={6}>
<BlocksContainer /> <BlocksContainer />
</Col> </Col>
<Col md={6}> <Col xl={6}>
<TransactionsContainer /> <TransactionsContainer />
</Col> </Col>
</Row> </Row>
</React.Fragment> </div>
); );
export default ExplorerDashboardLayout; export default ExplorerDashboardLayout;

6
embark-ui/src/components/Pagination.js
View File

@ -2,14 +2,14 @@ import React from 'react';
import {Pagination, PaginationItem, PaginationLink} from 'reactstrap'; import {Pagination, PaginationItem, PaginationLink} from 'reactstrap';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
const NB_PAGES_MAX = 14; const NB_PAGES_MAX = 8;
const Pages = ({currentPage, numberOfPages, changePage}) => { const Pages = ({currentPage, numberOfPages, changePage}) => {
let i = currentPage - NB_PAGES_MAX / 2; let i = currentPage - NB_PAGES_MAX / 2;
if (i < 1) { if (i < 1) {
i = 1; i = 1;
} }
let max = i + NB_PAGES_MAX; let max = i + NB_PAGES_MAX - 1;
if (max > numberOfPages) { if (max > numberOfPages) {
max = numberOfPages; max = numberOfPages;
} }
@ -19,7 +19,7 @@ const Pages = ({currentPage, numberOfPages, changePage}) => {
} }
return ( return (
<Pagination aria-label="Page navigation example"> <Pagination aria-label="Page navigation example" className="mt-4 mb-0 float-right">
<PaginationItem disabled={currentPage <= 1}> <PaginationItem disabled={currentPage <= 1}>
<PaginationLink previous href="#" onClick={(e) => { <PaginationLink previous href="#" onClick={(e) => {
e.preventDefault(); e.preventDefault();