pull merge code
This commit is contained in:
commit
402a5fdf6c
|
@ -259,7 +259,7 @@ class ImportImage extends Component {
|
||||||
})
|
})
|
||||||
}}
|
}}
|
||||||
value={this.state.dataSearch}
|
value={this.state.dataSearch}
|
||||||
id="inputSearch" className="form-control m-input"
|
id="inputSearch" className="form-control m-input font-family-text"
|
||||||
placeholder="Tên ảnh..."
|
placeholder="Tên ảnh..."
|
||||||
data-col-index={0}
|
data-col-index={0}
|
||||||
/>
|
/>
|
||||||
|
@ -267,6 +267,7 @@ class ImportImage extends Component {
|
||||||
<div className="form-group m-form__group col-xl-2">
|
<div className="form-group m-form__group col-xl-2">
|
||||||
{process.env.REACT_APP_SOURCE_IMG === "1" ?
|
{process.env.REACT_APP_SOURCE_IMG === "1" ?
|
||||||
<Select
|
<Select
|
||||||
|
className="font-family-text"
|
||||||
placeholder={'Loại ảnh'}
|
placeholder={'Loại ảnh'}
|
||||||
value={this.state.valueSelected}
|
value={this.state.valueSelected}
|
||||||
onChange={this.changeHandleFilter}
|
onChange={this.changeHandleFilter}
|
||||||
|
@ -333,7 +334,7 @@ class ImportImage extends Component {
|
||||||
{this.state.dataRole?.indexOf('import:edit') === -1 && this.state.dataRole?.indexOf('import:delete') === -1 ? "" : <th>Thao tác</th>}
|
{this.state.dataRole?.indexOf('import:edit') === -1 && this.state.dataRole?.indexOf('import:delete') === -1 ? "" : <th>Thao tác</th>}
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>{bulletedListImg}</tbody>
|
<tbody className="font-family-text">{bulletedListImg}</tbody>
|
||||||
</table>
|
</table>
|
||||||
<Modalupload
|
<Modalupload
|
||||||
show={this.state.modalUploadShow}
|
show={this.state.modalUploadShow}
|
||||||
|
|
|
@ -377,8 +377,8 @@ export default function User() {
|
||||||
</div>
|
</div>
|
||||||
<div className="table-responsive text-nowrap">
|
<div className="table-responsive text-nowrap">
|
||||||
<table className="table table-bordered font-family-text color table-hover table-checkable dataTable no-footer dtr-inline collapsed">
|
<table className="table table-bordered font-family-text color table-hover table-checkable dataTable no-footer dtr-inline collapsed">
|
||||||
<thead>
|
<thead className='k-grid-header' role='rowgroup' style={{backgroundColor: '#2673b4'}}>
|
||||||
<tr>
|
<tr className='font-family-text color' style={{color: 'white', fontWeight: 600, fontSize: 16,}}>
|
||||||
<th style={{ 'verticalAlign': 'middle', 'width': '80px' }}>STT</th>
|
<th style={{ 'verticalAlign': 'middle', 'width': '80px' }}>STT</th>
|
||||||
<th style={{ 'verticalAlign': 'middle', 'width': '240px' }}>Tên đăng nhập</th>
|
<th style={{ 'verticalAlign': 'middle', 'width': '240px' }}>Tên đăng nhập</th>
|
||||||
<th style={{ 'verticalAlign': 'middle', 'width': '280px' }}>Họ tên</th>
|
<th style={{ 'verticalAlign': 'middle', 'width': '280px' }}>Họ tên</th>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user