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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
8aa5076d
Commit
8aa5076d
authored
Apr 04, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pollished team index
parent
863e5eb7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
13 deletions
+16
-13
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+12
-6
app/views/team_members/_show.html.haml
app/views/team_members/_show.html.haml
+4
-7
No files found.
app/assets/stylesheets/common.scss
View file @
8aa5076d
...
@@ -9,6 +9,14 @@ a {
...
@@ -9,6 +9,14 @@ a {
&
.btn
{
&
.btn
{
color
:
$style_color
;
color
:
$style_color
;
}
}
&
.dark
{
color
:
$style_color
;
}
&
.lined
{
text-decoration
:underlined
;
}
}
}
...
@@ -32,6 +40,10 @@ a:focus {
...
@@ -32,6 +40,10 @@ a:focus {
color
:
$link_color
!
important
;
color
:
$link_color
!
important
;
}
}
.dlink
{
}
.pills
a
:hover
{
.pills
a
:hover
{
background-color
:
#ccc
;
background-color
:
#ccc
;
}
}
...
@@ -700,12 +712,6 @@ input.git_clone_url {
...
@@ -700,12 +712,6 @@ input.git_clone_url {
width
:
475px
;
width
:
475px
;
}
}
.team_member_row
{
img
{
width
:
60px
;
}
}
.merge-request-form-holder
{
.merge-request-form-holder
{
select
{
select
{
width
:
300px
;
width
:
300px
;
...
...
app/views/team_members/_show.html.haml
View file @
8aa5076d
-
user
=
member
.
user
-
user
=
member
.
user
-
allow_admin
=
can?
current_user
,
:admin_project
,
@project
-
allow_admin
=
can?
current_user
,
:admin_project
,
@project
%li
{
:id
=>
dom_id
(
member
),
:class
=>
"team_member_row wll"
}
%li
{
:id
=>
dom_id
(
member
),
:class
=>
"team_member_row wll"
}
.left
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
user
.
name
do
=
image_tag
gravatar_icon
(
user
.
email
,
60
),
:class
=>
"styled_image"
.row
.row
.span8
.span8
%h4
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
user
.
name
,
:class
=>
"dark"
do
=
truncate
(
user
.
name
,
:lenght
=>
24
)
=
image_tag
gravatar_icon
(
user
.
email
,
40
),
:class
=>
"avatar"
%
br
%
strong
=
truncate
(
user
.
name
,
:lenght
=>
40
)
%small
=
truncate
user
.
email
,
:lenght
=>
24
.prepend-top-10
=
user
.
email
.span3
.span3
=
form_for
(
member
,
:as
=>
:team_member
,
:url
=>
project_team_member_path
(
@project
,
member
))
do
|
f
|
=
form_for
(
member
,
:as
=>
:team_member
,
:url
=>
project_team_member_path
(
@project
,
member
))
do
|
f
|
...
...
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