Move the search box up so that it is in line (to the left) of the paragraph of merchant text
This commit is contained in:
parent
8fbd72bb1a
commit
5af3a3acde
2 changed files with 10 additions and 8 deletions
|
@ -370,7 +370,6 @@ class AmbassadorsPage extends Component {
|
|||
<div className="row">
|
||||
<div className="col-md-10 mx-md-auto">
|
||||
|
||||
|
||||
<h2 className="ambassadorsTitle" style={centerStyle}><FormattedMessage id="ambassadors.title" /></h2>
|
||||
{ /* Conditional Rendering */}
|
||||
{(this.state.loading) ? (
|
||||
|
|
|
@ -279,6 +279,15 @@ class MerchantsPage extends Component {
|
|||
|
||||
merchantsData = merchantsData.sort(sortBy('location.searchText'));
|
||||
|
||||
const textComponent = (
|
||||
<span>
|
||||
<FormattedHTMLMessage id="merchants.description1" />
|
||||
<Link to="/ambs">
|
||||
<FormattedMessage id="merchants.ambassadors_link_description" />
|
||||
</Link>
|
||||
<FormattedHTMLMessage id="merchants.description2" />
|
||||
</span>
|
||||
);
|
||||
|
||||
return (
|
||||
<div>
|
||||
|
@ -295,13 +304,6 @@ class MerchantsPage extends Component {
|
|||
<img src={LoadingGif} alt="Loading" style={loadingStyle} />
|
||||
): (
|
||||
<div>
|
||||
<p style={{ textAlign: 'left', marginRight: 20 }}>
|
||||
<FormattedHTMLMessage id="merchants.description1" />
|
||||
<Link to="/ambs">
|
||||
<FormattedMessage id="merchants.ambassadors_link_description" />
|
||||
</Link>
|
||||
<FormattedHTMLMessage id="merchants.description2" />
|
||||
</p>
|
||||
|
||||
<Modal
|
||||
isOpen={this.state.mapsModalIsOpen}
|
||||
|
@ -325,6 +327,7 @@ class MerchantsPage extends Component {
|
|||
<div>
|
||||
<br />
|
||||
<EnhancedTable
|
||||
description={textComponent}
|
||||
columnData={columnData}
|
||||
data={merchantsData}
|
||||
orderBy="account"
|
||||
|
|
Loading…
Reference in a new issue