Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
8697b872
Commit
8697b872
authored
Aug 25, 2020
by
EKSAD
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
89402ba7
2b07702a
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
189 additions
and
187 deletions
+189
-187
app.css
src/assets/sass/app.css
+2
-2
Home.js
src/container/Home.js
+2
-2
UnitBisnis.js
src/container/MasterData/UnitBisnis.js
+13
-14
ResetPassword.js
src/container/ResetPassword.js
+172
-169
No files found.
src/assets/sass/app.css
View file @
8697b872
.main-color{
background-color: #
1a2d3e
!important;
background-color: #
273b80
!important;
}
.sub-color{
...
...
@@ -7,7 +7,7 @@
}
.blue-color{
color: #
1a2d3e
!important;
color: #
273b80
!important;
}
.btn-save{
src/container/Home.js
View file @
8697b872
...
...
@@ -76,7 +76,7 @@ const useStyles = makeStyles((theme) => ({
easing
:
theme
.
transitions
.
easing
.
sharp
,
duration
:
theme
.
transitions
.
duration
.
enteringScreen
,
}),
backgroundColor
:
'#
1a2d3e
'
backgroundColor
:
'#
273b80
'
},
topleftClose
:
{
borderRight
:
0
,
...
...
@@ -91,7 +91,7 @@ const useStyles = makeStyles((theme) => ({
width
:
theme
.
spacing
(
7
)
+
1
,
},
paddingLeft
:
15
,
backgroundColor
:
'#
1a2d3e
'
backgroundColor
:
'#
273b80
'
},
drawerOpen
:
{
width
:
drawerWidth
,
...
...
src/container/MasterData/UnitBisnis.js
View file @
8697b872
...
...
@@ -430,8 +430,8 @@ export default class UnitBisnis extends Component {
<
/Alert
>
<
/Snackbar
>
{
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
}}
>
<
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'
}}
>
...
...
@@ -508,19 +508,18 @@ export default class UnitBisnis extends Component {
<
ReactTooltip
border
=
{
true
}
id
=
"create"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
/div
>
<
/div
>
)}
<
div
style
=
{{
padding
:
25
}}
>
<
MuiThemeProvider
theme
=
{
getMuiTheme
()}
>
<
MUIDataTable
theme
=
{
getMuiTheme
()}
data
=
{
this
.
state
.
dataTable
}
columns
=
{
columns
}
options
=
{
options
}
/
>
<
/MuiThemeProvider
>
<
div
style
=
{{
padding
:
25
}}
>
<
MuiThemeProvider
theme
=
{
getMuiTheme
()}
>
<
MUIDataTable
theme
=
{
getMuiTheme
()}
data
=
{
this
.
state
.
dataTable
}
columns
=
{
columns
}
options
=
{
options
}
/
>
<
/MuiThemeProvider
>
<
/div
>
<
/div
>
<
/div
>
)
:
<
div
>
<
div
style
=
{{
display
:
'flex'
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
paddingRight
:
25
,
paddingLeft
:
25
,
marginTop
:
-
150
}}
>
...
...
src/container/ResetPassword.js
View file @
8697b872
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment