fix margins by using a padding on the container instead

This commit is contained in:
Jonathan Rainville 2018-10-25 14:34:54 -04:00
parent 79cb60f164
commit b85f8aff8c
13 changed files with 24 additions and 16 deletions

View File

@ -13,7 +13,8 @@ CardTitleIdenticon.propTypes = {
id: PropTypes.string, id: PropTypes.string,
children: PropTypes.oneOfType([ children: PropTypes.oneOfType([
PropTypes.object, PropTypes.object,
PropTypes.array PropTypes.array,
PropTypes.string
]) ])
}; };

View File

@ -44,7 +44,7 @@ class Communication extends Component {
render() { render() {
return ( return (
<Row className="mt-3 justify-content-md-center"> <Row className="justify-content-md-center">
<Col xs="12" sm="9" lg="9"> <Col xs="12" sm="9" lg="9">
<Card> <Card>
<CardHeader> <CardHeader>

View File

@ -180,7 +180,7 @@ const EmbarkContract = ({contract, toggleContractOverview}) => (
); );
const ContractsHeader = ({deploymentPipeline, updateDeploymentPipeline}) => ( const ContractsHeader = ({deploymentPipeline, updateDeploymentPipeline}) => (
<Row className="mt-3"> <Row>
<div className="ml-auto mr-5"> <div className="ml-auto mr-5">
<FormGroup row> <FormGroup row>
<span className="mr-2">Deploy using</span> <span className="mr-2">Deploy using</span>

View File

@ -35,7 +35,7 @@ class Converter extends React.Component {
render() { render() {
return( return(
<Row className="mt-3 justify-content-md-center"> <Row className="justify-content-md-center">
<Col xs="12" sm="9" lg="9"> <Col xs="12" sm="9" lg="9">
<Card> <Card>
<CardHeader> <CardHeader>

View File

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

View File

@ -225,7 +225,7 @@ class Layout extends React.Component {
{searchResult.error} {searchResult.error}
</Alert> </Alert>
<Container fluid className="h-100"> <Container fluid className="h-100 pt-4">
{children} {children}
</Container> </Container>
</main> </main>

View File

@ -29,7 +29,7 @@ Process.propTypes = {
}; };
const Processes = ({processes}) => ( const Processes = ({processes}) => (
<Row className="mt-3"> <Row>
{processes.map((process) => <Process key={process.name} process={process} />)} {processes.map((process) => <Process key={process.name} process={process} />)}
</Row> </Row>
); );

View File

@ -19,7 +19,7 @@ class SignAndVerify extends React.Component {
this.state = { this.state = {
selectedAccount: this.props.accounts[0].address, selectedAccount: this.props.accounts[0].address,
messageToSign: '', messageToSign: '',
messageToVerify: '', messageToVerify: ''
}; };
} }
@ -40,7 +40,7 @@ class SignAndVerify extends React.Component {
render() { render() {
return ( return (
<Row className="mt-3 justify-content-md-center"> <Row className="justify-content-md-center">
<Col xs="12" sm="9" lg="6"> <Col xs="12" sm="9" lg="6">
<Card> <Card>
<CardHeader> <CardHeader>

View File

@ -1,4 +1,5 @@
.editor--grid { .editor--grid {
margin-left: -30px !important; margin-left: -30px !important;
margin-right: -30px !important; margin-right: -30px !important;
margin-top: -1.5rem !important;
} }

View File

@ -12,7 +12,7 @@ class EnsContainer extends Component {
showEns() { showEns() {
return ( return (
<Row className="mt-3 justify-content-md-center"> <Row className="justify-content-md-center">
<Col xs="12" sm="9" lg="6"> <Col xs="12" sm="9" lg="6">
<EnsLookup lookup={this.props.lookup} ensRecords={this.props.ensRecords}/> <EnsLookup lookup={this.props.lookup} ensRecords={this.props.ensRecords}/>
<EnsResolve resolve={this.props.resolve} ensRecords={this.props.ensRecords}/> <EnsResolve resolve={this.props.resolve} ensRecords={this.props.ensRecords}/>

View File

@ -35,11 +35,11 @@ class HomeContainer extends Component {
} }
isEmbark() { isEmbark() {
return this.state.activeProcess === EMBARK_PROCESS_NAME return this.state.activeProcess === EMBARK_PROCESS_NAME;
} }
updateTab(processName = EMBARK_PROCESS_NAME) { updateTab(processName = EMBARK_PROCESS_NAME) {
this.props.stopProcessLogs(this.state.activeProcess) this.props.stopProcessLogs(this.state.activeProcess);
this.props.fetchProcessLogs(processName, LOG_LIMIT); this.props.fetchProcessLogs(processName, LOG_LIMIT);
this.props.listenToProcessLogs(processName); this.props.listenToProcessLogs(processName);
@ -93,7 +93,13 @@ HomeContainer.propTypes = {
postCommand: PropTypes.func, postCommand: PropTypes.func,
postCommandSuggestions: PropTypes.func, postCommandSuggestions: PropTypes.func,
error: PropTypes.string, error: PropTypes.string,
loading: PropTypes.bool loading: PropTypes.bool,
stopProcessLogs: PropTypes.func,
fetchProcessLogs: PropTypes.func,
listenToProcessLogs: PropTypes.func,
fetchContracts: PropTypes.func,
services: PropTypes.array,
contracts: PropTypes.array
}; };
function mapStateToProps(state) { function mapStateToProps(state) {

View File

@ -11,7 +11,7 @@ const getQueryParams = (props) => {
return qs.parse(props.location.search, { return qs.parse(props.location.search, {
ignoreQueryPrefix: true ignoreQueryPrefix: true
}); });
} };
class TransactionDecoderContainer extends Component { class TransactionDecoderContainer extends Component {
@ -33,7 +33,7 @@ class TransactionDecoderContainer extends Component {
render() { render() {
return ( return (
<Row className="mt-3"> <Row>
<Col> <Col>
<TransactionDecoder transaction={this.props.transaction} <TransactionDecoder transaction={this.props.transaction}
transactionHash={getQueryParams(this.props).hash}/> transactionHash={getQueryParams(this.props).hash}/>

View File

@ -33,7 +33,7 @@ export function getTransactionsByAccount(state, address) {
} }
export function getTransactionsByBlock(state, blockNumber) { export function getTransactionsByBlock(state, blockNumber) {
return state.entities.transactions.filter((transaction) => transaction.blockNumber.toString() === blockNumber); return state.entities.transactions.filter((transaction) => transaction.hasOwnProperty('blockNumber') && transaction.blockNumber.toString() === blockNumber);
} }
export function getBlocks(state) { export function getBlocks(state) {