Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mingPayPc
Overview
Overview
Details
Activity
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
fengzhaoyu
mingPayPc
Commits
40155626
Commit
40155626
authored
Dec 09, 2019
by
liang ce
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ISV' of
http://gitlab.roboming.com/Simon/mingPay-web
into ISV
parents
0591352b
82283edd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
addOrRights.vue
src/components/pages/rightsManagement/addOrRights.vue
+9
-4
rightsManagement.vue
src/components/pages/rightsManagement/rightsManagement.vue
+1
-1
No files found.
src/components/pages/rightsManagement/addOrRights.vue
View file @
40155626
...
@@ -214,6 +214,9 @@ export default {
...
@@ -214,6 +214,9 @@ export default {
</
script
>
</
script
>
<
style
lang=
"less"
>
<
style
lang=
"less"
>
.addOrRights
{
scrollbar-width
:
none
;
/* Firefox */
}
.title
{
.title
{
font-weight
:
bolder
;
font-weight
:
bolder
;
line-height
:
22px
;
line-height
:
22px
;
...
@@ -247,9 +250,10 @@ export default {
...
@@ -247,9 +250,10 @@ export default {
color
:
rgba
(
0
,
0
,
0
,
0.85
);
color
:
rgba
(
0
,
0
,
0
,
0.85
);
}
}
.permissonTitle
{
.permissonTitle
{
margin-top
:
20px
;
padding
:
22px
20px
;
padding
:
22px
20px
;
background
:
#F
AFAFA
;
background
:
#F
2F2F2
!important
;
border
:
1px
solid
#
F8F8F8
;
border
:
1px
solid
#
dedede
!important
;
border-radius
:
4px
4px
0px
0px
;
border-radius
:
4px
4px
0px
0px
;
}
}
.confirm
{
.confirm
{
...
@@ -275,11 +279,12 @@ export default {
...
@@ -275,11 +279,12 @@ export default {
}
}
.box2
>
div
{
.box2
>
div
{
display
:
flex
;
display
:
flex
;
border
:
1px
solid
#f8f8f8
;
border
:
1px
solid
#dedede
!important
;
margin-top
:
-1px
;
}
}
.box2-2
{
.box2-2
{
flex
:
4
;
flex
:
4
;
border-right
:
1px
solid
#
f8f8f8
;
border-right
:
1px
solid
#
dedede
!important
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
padding-left
:
20px
;
padding-left
:
20px
;
...
...
src/components/pages/rightsManagement/rightsManagement.vue
View file @
40155626
...
@@ -217,7 +217,7 @@ export default {
...
@@ -217,7 +217,7 @@ export default {
margin-top
:
20px
;
margin-top
:
20px
;
}
}
.addRole
{
.addRole
{
margin-top
:
25
px
;
margin-top
:
10
px
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
.delete
{
.delete
{
...
...
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