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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c0d84dcd
Commit
c0d84dcd
authored
Jun 12, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group member filter layout
parent
8eea1a92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+0
-4
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+4
-3
app/views/projects/project_members/_team.html.haml
app/views/projects/project_members/_team.html.haml
+4
-3
No files found.
app/assets/stylesheets/pages/members.scss
View file @
c0d84dcd
...
@@ -121,10 +121,6 @@
...
@@ -121,10 +121,6 @@
background
:
transparent
;
background
:
transparent
;
border
:
0
;
border
:
0
;
outline
:
0
;
outline
:
0
;
@include
media-breakpoint-up
(
sm
)
{
right
:
160px
;
}
}
}
.flex-project-members-panel
{
.flex-project-members-panel
{
...
...
app/views/groups/group_members/index.html.haml
View file @
c0d84dcd
...
@@ -25,9 +25,10 @@
...
@@ -25,9 +25,10 @@
%span
.badge
=
@members
.
total_count
%span
.badge
=
@members
.
total_count
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form flex-project-members-form'
do
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form flex-project-members-form'
do
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
.position-relative.append-right-8
%button
.member-search-btn
{
type:
"submit"
,
"aria-label"
=>
"Submit search"
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
icon
(
"search"
)
%button
.member-search-btn
{
type:
"submit"
,
"aria-label"
=>
"Submit search"
}
=
icon
(
"search"
)
-
if
can_manage_members
-
if
can_manage_members
=
render
'shared/members/filter_2fa_dropdown'
=
render
'shared/members/filter_2fa_dropdown'
=
render
'shared/members/sort_dropdown'
=
render
'shared/members/sort_dropdown'
...
...
app/views/projects/project_members/_team.html.haml
View file @
c0d84dcd
...
@@ -9,9 +9,10 @@
...
@@ -9,9 +9,10 @@
%span
.badge.badge-pill
=
members
.
total_count
%span
.badge.badge-pill
=
members
.
total_count
=
form_tag
project_project_members_path
(
project
),
method: :get
,
class:
'form-inline member-search-form flex-project-members-form'
do
=
form_tag
project_project_members_path
(
project
),
method: :get
,
class:
'form-inline member-search-form flex-project-members-form'
do
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
.position-relative
%button
.member-search-btn
{
type:
"submit"
,
"aria-label"
=>
"Submit search"
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
icon
(
"search"
)
%button
.member-search-btn
{
type:
"submit"
,
"aria-label"
=>
"Submit search"
}
=
icon
(
"search"
)
=
render
'shared/members/sort_dropdown'
=
render
'shared/members/sort_dropdown'
%ul
.content-list.members-list
%ul
.content-list.members-list
=
render
partial:
'shared/members/member'
,
collection:
members
,
as: :member
=
render
partial:
'shared/members/member'
,
collection:
members
,
as: :member
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