Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
fe34c5f6
Commit
fe34c5f6
authored
May 23, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix members table layout
parent
56de42b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
app/assets/stylesheets/framework/panels.scss
app/assets/stylesheets/framework/panels.scss
+0
-1
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+4
-0
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+3
-3
No files found.
app/assets/stylesheets/framework/panels.scss
View file @
fe34c5f6
...
@@ -11,7 +11,6 @@
...
@@ -11,7 +11,6 @@
.card-header
{
.card-header
{
padding
:
$gl-vert-padding
$gl-padding
;
padding
:
$gl-vert-padding
$gl-padding
;
line-height
:
36px
;
line-height
:
36px
;
color
:
$white-light
;
.controls
{
.controls
{
margin-top
:
-2px
;
margin-top
:
-2px
;
...
...
app/assets/stylesheets/pages/members.scss
View file @
fe34c5f6
...
@@ -9,6 +9,10 @@
...
@@ -9,6 +9,10 @@
}
}
}
}
.member-sort-dropdown
{
margin-left
:
$gl-padding-8
;
}
.member
{
.member
{
.list-item-name
{
.list-item-name
{
@include
media-breakpoint-up
(
sm
)
{
@include
media-breakpoint-up
(
sm
)
{
...
...
app/views/shared/members/_member.html.haml
View file @
fe34c5f6
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
title:
'Resend invite'
title:
'Resend invite'
-
if
user
!=
current_user
&&
member
.
can_update?
-
if
user
!=
current_user
&&
member
.
can_update?
=
form_for
member
,
remote:
true
,
html:
{
class:
'js-edit-member-form'
}
do
|
f
|
=
form_for
member
,
remote:
true
,
html:
{
class:
'js-edit-member-form
form-horizontal
'
}
do
|
f
|
=
f
.
hidden_field
:access_level
=
f
.
hidden_field
:access_level
.member-form-control.dropdown.append-right-5
.member-form-control.dropdown.append-right-5
%button
.dropdown-menu-toggle.js-member-permissions-dropdown
{
type:
"button"
,
%button
.dropdown-menu-toggle.js-member-permissions-dropdown
{
type:
"button"
,
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
method: :post
,
method: :post
,
class:
'btn btn-success prepend-left-10'
,
class:
'btn btn-success prepend-left-10'
,
title:
'Grant access'
do
title:
'Grant access'
do
%span
{
class:
(
'
.d-block.
d-sm-none'
unless
force_mobile_view
)
}
%span
{
class:
(
'
d-block
d-sm-none'
unless
force_mobile_view
)
}
Grant access
Grant access
-
unless
force_mobile_view
-
unless
force_mobile_view
=
icon
(
'check inverse'
,
class:
'd-none d-sm-block'
)
=
icon
(
'check inverse'
,
class:
'd-none d-sm-block'
)
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
data:
{
confirm:
remove_member_message
(
member
)
},
data:
{
confirm:
remove_member_message
(
member
)
},
class:
'btn btn-remove prepend-left-10'
,
class:
'btn btn-remove prepend-left-10'
,
title:
remove_member_title
(
member
)
do
title:
remove_member_title
(
member
)
do
%span
{
class:
(
'
.d-block.
d-sm-none'
unless
force_mobile_view
)
}
%span
{
class:
(
'
d-block
d-sm-none'
unless
force_mobile_view
)
}
Delete
Delete
-
unless
force_mobile_view
-
unless
force_mobile_view
=
icon
(
'trash'
,
class:
'd-none d-sm-block'
)
=
icon
(
'trash'
,
class:
'd-none d-sm-block'
)
...
...
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