Download as
Browse Code »

Commit 8aa5076d68e55a0b0ead7c9b51250d9f3cc739d6

Authored by Dmitriy Zaporozhets
1 parent 863e5eb7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

pollished team index

Showing 2 changed files with 16 additions and 13 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @8aa5076
... ... @@ -9,6 +9,14 @@ a {
9 9 &.btn {
10 10 color: $style_color;
11 11 }
  12 +
  13 + &.dark {
  14 + color: $style_color;
  15 + }
  16 +
  17 + &.lined {
  18 + text-decoration:underlined;
  19 + }
12 20 }
13 21  
14 22  
... ... @@ -32,6 +40,10 @@ a:focus {
32 40 color: $link_color !important;
33 41 }
34 42  
  43 +.dlink {
  44 +
  45 +}
  46 +
35 47 .pills a:hover {
36 48 background-color:#ccc;
37 49 }
... ... @@ -700,12 +712,6 @@ input.git_clone_url {
700 712 width:475px;
701 713 }
702 714  
703   -.team_member_row {
704   - img {
705   - width:60px;
706   - }
707   -}
708   -
709 715 .merge-request-form-holder {
710 716 select {
711 717 width:300px;
... ...
app/views/team_members/_show.html.haml
  Diff comments   View file @8aa5076
1 1 - user = member.user
2 2 - allow_admin = can? current_user, :admin_project, @project
3 3 %li{:id => dom_id(member), :class => "team_member_row wll"}
4   - .left
5   - = link_to project_team_member_path(@project, member), :title => user.name do
6   - = image_tag gravatar_icon(user.email, 60), :class => "styled_image"
7 4 .row
8 5 .span8
9   - %h4
10   - = truncate(user.name, :lenght => 24)
11   - %br
12   - %small= truncate user.email, :lenght => 24
  6 + = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do
  7 + = image_tag gravatar_icon(user.email, 40), :class => "avatar"
  8 + %strong= truncate(user.name, :lenght => 40)
  9 + .prepend-top-10= user.email
13 10  
14 11 .span3
15 12 = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
... ...