agorise/palmpay.io-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Solve confict

Browse source
This commit is contained in:
Letícia Camara 2018-10-04 15:58:08 -03:00
commit 99df4e48b9
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/components/EnhancedSearch.js
View file

@ -30,11 +30,8 @@ const styles = theme => ({
}, },
textField: { textField: {
flexBasis: 280, flexBasis: 280,
borderColor: "#139657"
}, },
focused: {
color: '#139657',
backgroundColor: '#139657',
}
}); });
/** /**
@ -53,19 +50,18 @@ class EnhancedSearch extends Component {
<div className="search-books-bar"> <div className="search-books-bar">
<div className="search-books-input-wrapper" style={{ textAlign: 'left', marginLeft: 20}}> <div className="search-books-input-wrapper" style={{ textAlign: 'left', marginLeft: 20}}>
<TextField <TextField
style={{ textAlign: 'left', width: 350 }} style={{ textAlign: 'left', width: 350,borderColor: "#139657" }}
id="outlined-adornment-weight" id="outlined-adornment-weight"
className={classNames(classes.margin, classes.textField)} className={classNames(classes.margin, classes.textField)}
classes={{ focused: classes.focused }} variant="outlined"
variant="outlined" label="Search"
label="Search"
placeholder="Enter search term" placeholder="Enter search term"
value={query} value={query}
onChange={(event) => onUpdateQuery(event.target.value)} onChange={(event) => onUpdateQuery(event.target.value)}
InputProps={{ InputProps={{
startAdornment: <InputAdornment position="start"><Search /></InputAdornment>, startAdornment: <InputAdornment position="start"><Search /></InputAdornment>,
}} }}
/> />
<br /> <br />
{this.props.showSearchColumns && this.props.columns.map(column => ( {this.props.showSearchColumns && this.props.columns.map(column => (
<FormControlLabel <FormControlLabel
@ -84,7 +80,7 @@ class EnhancedSearch extends Component {
</div> </div>
</div> </div>
); );
} };
} }
// Type checking the props of the component // Type checking the props of the component