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
Tatuya Kamada
gitlab-ce
Commits
15a3111a
Commit
15a3111a
authored
Sep 02, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mobile spacing improvements
parent
49a31e64
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
20 deletions
+41
-20
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+0
-4
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+0
-12
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+36
-0
app/views/projects/project_members/index.html.haml
app/views/projects/project_members/index.html.haml
+4
-3
app/views/shared/members/_group.html.haml
app/views/shared/members/_group.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/forms.scss
View file @
15a3111a
...
@@ -125,7 +125,3 @@ label {
...
@@ -125,7 +125,3 @@ label {
border-right
:
0
;
border-right
:
0
;
}
}
}
}
.help-block
{
margin-bottom
:
0
;
}
app/assets/stylesheets/pages/groups.scss
View file @
15a3111a
.member-search-form
{
input
[
type
=
'search'
]
{
width
:
225px
;
vertical-align
:
bottom
;
@media
(
max-width
:
$screen-xs-max
)
{
width
:
100px
;
vertical-align
:
bottom
;
}
}
}
.milestone-row
{
.milestone-row
{
@include
str-truncated
(
90%
);
@include
str-truncated
(
90%
);
}
}
...
...
app/assets/stylesheets/pages/members.scss
View file @
15a3111a
...
@@ -57,3 +57,39 @@
...
@@ -57,3 +57,39 @@
margin-left
:
auto
;
margin-left
:
auto
;
line-height
:
43px
;
line-height
:
43px
;
}
}
.member.existing-title
{
@media
(
min-width
:
$screen-sm-min
)
{
float
:
left
;
}
}
.member-search-form
{
position
:
relative
;
@media
(
min-width
:
$screen-sm-min
)
{
float
:
right
;
}
.form-control
{
width
:
100%
;
padding-right
:
35px
;
@media
(
min-width
:
$screen-sm-min
)
{
width
:
350px
;
}
}
}
.member-search-btn
{
position
:
absolute
;
right
:
0
;
top
:
0
;
height
:
35px
;
padding-left
:
10px
;
padding-right
:
10px
;
color
:
$gray-darkest
;
background
:
transparent
;
border
:
0
;
outline
:
0
;
}
app/views/projects/project_members/index.html.haml
View file @
15a3111a
...
@@ -15,12 +15,13 @@
...
@@ -15,12 +15,13 @@
=
render
'shared/members/requests'
,
membership_source:
@project
,
requesters:
@requesters
=
render
'shared/members/requests'
,
membership_source:
@project
,
requesters:
@requesters
.append-bottom-default.clearfix
.append-bottom-default.clearfix
%h5
.
pull-left
%h5
.
member.existing-title
Existing users and groups
Existing users and groups
=
form_tag
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
method: :get
,
class:
'form-inline member-search-form
pull-right hidden-xs hidden-sm
'
do
=
form_tag
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
method: :get
,
class:
'form-inline member-search-form'
do
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
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
@groups
.
size
>
0
-
if
@groups
.
size
>
0
=
render
'groups'
,
groups:
@groups
=
render
'groups'
,
groups:
@groups
...
...
app/views/shared/members/_group.html.haml
View file @
15a3111a
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%span
{
class:
(
'text-warning'
if
group_link
.
expires_soon?
)
}
%span
{
class:
(
'text-warning'
if
group_link
.
expires_soon?
)
}
Expires in
#{
distance_of_time_in_words_to_now
(
group_link
.
expires_at
)
}
Expires in
#{
distance_of_time_in_words_to_now
(
group_link
.
expires_at
)
}
.controls.member-controls
.controls.member-controls
=
form_tag
namespace_project_group_link_path
(
@project
.
namespace
,
@project
,
group_link
),
method: :put
,
remote:
true
,
class:
'form-horizontal'
do
=
form_tag
namespace_project_group_link_path
(
@project
.
namespace
,
@project
,
group_link
),
method: :put
,
remote:
true
,
class:
'form-horizontal
js-edit-member-form
'
do
=
select_tag
'group_link[group_access]'
,
options_for_select
(
ProjectGroupLink
.
access_options
,
group_link
.
group_access
),
class:
'form-control member-form-control append-right-5 js-member-update-control'
,
id:
"member_access_level_
#{
group
.
id
}
"
=
select_tag
'group_link[group_access]'
,
options_for_select
(
ProjectGroupLink
.
access_options
,
group_link
.
group_access
),
class:
'form-control member-form-control append-right-5 js-member-update-control'
,
id:
"member_access_level_
#{
group
.
id
}
"
.prepend-left-5.append-right-10.clearable-input.member-form-control
.prepend-left-5.append-right-10.clearable-input.member-form-control
=
text_field_tag
'group_link[expires_at]'
,
group_link
.
expires_at
,
class:
'form-control js-access-expiration-date js-member-update-control'
,
placeholder:
'Expiration date'
,
id:
"member_expires_at_
#{
group
.
id
}
"
=
text_field_tag
'group_link[expires_at]'
,
group_link
.
expires_at
,
class:
'form-control js-access-expiration-date js-member-update-control'
,
placeholder:
'Expiration date'
,
id:
"member_expires_at_
#{
group
.
id
}
"
...
...
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