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
3354bfd8
Commit
3354bfd8
authored
Sep 05, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CSS cleanup
parent
fe71edc3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
15 deletions
+7
-15
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+0
-4
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+3
-7
app/views/groups/group_members/_new_group_member.html.haml
app/views/groups/group_members/_new_group_member.html.haml
+1
-1
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+1
-1
app/views/projects/project_members/_new_project_member.html.haml
...ws/projects/project_members/_new_project_member.html.haml
+1
-1
app/views/projects/project_members/index.html.haml
app/views/projects/project_members/index.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/selects.scss
View file @
3354bfd8
...
@@ -191,10 +191,6 @@
...
@@ -191,10 +191,6 @@
&
.input-clamp
{
&
.input-clamp
{
max-width
:
100%
;
max-width
:
100%
;
}
}
&
.input-full
{
width
:
100%
;
}
}
}
.select2-highlighted
{
.select2-highlighted
{
...
...
app/assets/stylesheets/pages/members.scss
View file @
3354bfd8
.project-members-new
{
>
h5
{
font-weight
:
normal
;
}
}
.member
{
.member
{
.list-item-name
{
.list-item-name
{
float
:
none
;
float
:
none
;
...
@@ -16,6 +10,7 @@
...
@@ -16,6 +10,7 @@
.controls
{
.controls
{
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
-
webkit-flex
;
display
:
flex
;
display
:
flex
;
width
:
400px
;
width
:
400px
;
max-width
:
50%
;
max-width
:
50%
;
...
@@ -26,8 +21,9 @@
...
@@ -26,8 +21,9 @@
margin-top
:
5px
;
margin-top
:
5px
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
-
webkit-flex
;
display
:
flex
;
display
:
flex
;
flex
:
1
;
width
:
100%
;
margin-top
:
3px
;
margin-top
:
3px
;
}
}
}
}
...
...
app/views/groups/group_members/_new_group_member.html.haml
View file @
3354bfd8
=
form_for
@group_member
,
url:
group_group_members_path
(
@group
),
html:
{
class:
'users-project-form users-group-form'
}
do
|
f
|
=
form_for
@group_member
,
url:
group_group_members_path
(
@group
),
html:
{
class:
'users-project-form users-group-form'
}
do
|
f
|
.row
.row
.col-md-4.col-lg-6
.col-md-4.col-lg-6
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-
full
'
,
scope: :all
,
email_user:
true
)
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-
clamp
'
,
scope: :all
,
email_user:
true
)
.help-block.append-bottom-10
.help-block.append-bottom-10
Search for users by name, username, or email, or invite new ones using their email address.
Search for users by name, username, or email, or invite new ones using their email address.
...
...
app/views/groups/group_members/index.html.haml
View file @
3354bfd8
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%hr
%hr
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
.project-members-new.append-bottom-default
.project-members-new.append-bottom-default
%
h5
.clearfix
%
p
.clearfix
Add new user to
Add new user to
%strong
=
@group
.
name
%strong
=
@group
.
name
=
render
"new_group_member"
=
render
"new_group_member"
...
...
app/views/projects/project_members/_new_project_member.html.haml
View file @
3354bfd8
=
form_for
@project_member
,
as: :project_member
,
url:
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
html:
{
class:
'users-project-form'
}
do
|
f
|
=
form_for
@project_member
,
as: :project_member
,
url:
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
html:
{
class:
'users-project-form'
}
do
|
f
|
.row
.row
.col-md-4.col-lg-6
.col-md-4.col-lg-6
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
"input-
full
"
,
scope: :all
,
email_user:
true
)
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
"input-
clamp
"
,
scope: :all
,
email_user:
true
)
.help-block.append-bottom-10
.help-block.append-bottom-10
Search for users by name, username, or email, or invite new ones using their email address.
Search for users by name, username, or email, or invite new ones using their email address.
...
...
app/views/projects/project_members/index.html.haml
View file @
3354bfd8
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
%hr
%hr
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
.project-members-new.append-bottom-default
.project-members-new.append-bottom-default
%
h5
.clearfix
%
p
.clearfix
Add new user to
Add new user to
%strong
=
@project
.
name
%strong
=
@project
.
name
=
render
"new_project_member"
=
render
"new_project_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