Commit 54c0284d authored by ardiansyah's avatar ardiansyah

Merge branch 'ENV-STAGING' into 'ENV-DEV'

# Conflicts:
#   src/container/MasterData/ReportItems/CreateReportItems.js
#   src/container/MasterData/ReportItems/EditReportItems.js
parents 3ce7e46b 09ca23c1
{
"name": "my-app",
"version": "0.1.0",
"homepage": "http://localhost:8080/web/",
"homepage": "http://localhost:8080/web-staging/",
"private": true,
"dependencies": {
"@date-io/date-fns": "^1.3.13",
......
.main-color{
/* .main-color{
background-color: #273b80 !important;
}
} */
/* for staging */
/* .main-color{
.main-color{
background-color: #0b6b24 !important;
} */
}
/* .main-color{
background-color: #1474CA !important;
......@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
backgroundColor: '#273b80'
backgroundColor: '#0b6b24'
},
topleftClose: {
borderRight: 0,
......@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({
},
padding: 20,
display: 'flex',
backgroundColor: '#273b80'
backgroundColor: '#0b6b24'
},
drawerOpen: {
width: drawerWidth,
......
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