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

Solve conflicts

Browse source
This commit is contained in:
Letícia Camara 2018-11-11 23:21:45 -02:00
commit 46242370b7
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/assets/css/palmpay.css
View file

@ -406,4 +406,9 @@ header .col-md-10, header .col-md-10 > div {
} }
.uppercase-text { .uppercase-text {
text-transform: uppercase; text-transform: uppercase;
}
.row {
margin-right: 0 !important;
margin-left: 0 !important;
} }

19
src/components/EnhancedSearch.js
View file

@ -49,12 +49,9 @@ class EnhancedSearch extends Component {
<div className="search-books"> <div className="search-books">
<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}}>
<table> <div className="row">
<tbody> <div className="col-md-4"> <TextField
<tr> style={{ textAlign: 'left', width: '100%',borderColor: "#139657" }}
<td>
<TextField
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)}
variant="outlined" variant="outlined"
@ -65,12 +62,10 @@ class EnhancedSearch extends Component {
InputProps={{ InputProps={{
startAdornment: <InputAdornment position="start"><Search /></InputAdornment>, startAdornment: <InputAdornment position="start"><Search /></InputAdornment>,
}} }}
/> /> </div>
</td>
<td>{textComponent}</td> <div className="col-md-8"> {textComponent}</div>
</tr> </div>
</tbody>
</table>
<br /> <br />
{this.props.showSearchColumns && this.props.columns.map(column => ( {this.props.showSearchColumns && this.props.columns.map(column => (
<FormControlLabel <FormControlLabel