Commit 2b07702a authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni-dev(pc)' into 'master'

ganti warna header

See merge request !176
parents feb268d8 95a8c433
.main-color{ .main-color{
background-color: #1a2d3e !important; background-color: #273b80 !important;
} }
.sub-color{ .sub-color{
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
} }
.blue-color{ .blue-color{
color: #1a2d3e !important; color: #273b80 !important;
} }
.btn-save{ .btn-save{
...@@ -76,7 +76,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -76,7 +76,7 @@ const useStyles = makeStyles((theme) => ({
easing: theme.transitions.easing.sharp, easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen, duration: theme.transitions.duration.enteringScreen,
}), }),
backgroundColor: '#1a2d3e' backgroundColor: '#273b80'
}, },
topleftClose: { topleftClose: {
borderRight: 0, borderRight: 0,
...@@ -91,7 +91,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -91,7 +91,7 @@ const useStyles = makeStyles((theme) => ({
width: theme.spacing(7) + 1, width: theme.spacing(7) + 1,
}, },
paddingLeft: 15, paddingLeft: 15,
backgroundColor: '#1a2d3e' backgroundColor: '#273b80'
}, },
drawerOpen: { drawerOpen: {
width: drawerWidth, width: drawerWidth,
......
...@@ -430,8 +430,8 @@ export default class UnitBisnis extends Component { ...@@ -430,8 +430,8 @@ export default class UnitBisnis extends Component {
</Alert> </Alert>
</Snackbar> </Snackbar>
{this.state.visibleUnitBisnis === true ? {this.state.visibleUnitBisnis === true ?
<div> this.state.load && (
{this.state.load && ( <div>
<div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}> <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
<label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Business Unit</label> <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Business Unit</label>
<div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}> <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
...@@ -508,19 +508,18 @@ export default class UnitBisnis extends Component { ...@@ -508,19 +508,18 @@ export default class UnitBisnis extends Component {
<ReactTooltip border={true} id="create" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="create" place="bottom" type="light" effect="solid" />
</div> </div>
</div> </div>
)} <div style={{ padding: 25 }}>
<div style={{ padding: 25 }}> <MuiThemeProvider theme={getMuiTheme()}>
<MuiThemeProvider theme={getMuiTheme()}> <MUIDataTable
<MUIDataTable theme={getMuiTheme()}
theme={getMuiTheme()} data={this.state.dataTable}
data={this.state.dataTable} columns={columns}
columns={columns} options={options}
options={options} />
/> </MuiThemeProvider>
</MuiThemeProvider> </div>
</div> </div>
</div> )
: :
<div> <div>
<div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}> <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment