Download as
Browse Code »

Commit 088860de4ed3a10b824092c6ab3c47d9f6f27d6a

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

feed few fixes

Showing 5 changed files with 15 additions and 6 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @088860d
@@ -881,6 +881,14 @@ li.note { @@ -881,6 +881,14 @@ li.note {
881 881
882 .remember_me { 882 .remember_me {
883 text-align:left; 883 text-align:left;
  884 +
  885 + input {
  886 + margin:0;
  887 + }
  888 +
  889 + span {
  890 + padding-left:5px;
  891 + }
884 } 892 }
885 893
886 894
app/views/dashboard/_issues_feed.html.haml
  Diff comments   View file @088860d
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 = link_to [issue.project, issue] do 3 = link_to [issue.project, issue] do
4 %p 4 %p
5 %strong 5 %strong
6 - %span.pretty_label= issue.project.name 6 + %span= issue.project.name
7 – 7 –
8 Issue # 8 Issue #
9 = issue.id 9 = issue.id
app/views/dashboard/_merge_requests_feed.html.haml
  Diff comments   View file @088860d
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 = link_to [merge_request.project, merge_request] do 3 = link_to [merge_request.project, merge_request] do
4 %p 4 %p
5 %strong 5 %strong
6 - %span.pretty_label= merge_request.project.name 6 + %strong= merge_request.project.name
7 – 7 –
8 Merge Request ##{merge_request.id} 8 Merge Request ##{merge_request.id}
9 = truncate merge_request.title, :length => 50 9 = truncate merge_request.title, :length => 50
app/views/dashboard/_projects_feed.html.haml
  Diff comments   View file @088860d
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 = link_to project, :class => "project_link" do 4 = link_to project, :class => "project_link" do
5 %span.ico.project 5 %span.ico.project
6 = truncate project.name, :length => 24 6 = truncate project.name, :length => 24
  7 +  
7 %small 8 %small
8 last activity at 9 last activity at
9 = project.last_activity_date.stamp("Aug 25, 2011") 10 = project.last_activity_date.stamp("Aug 25, 2011")
app/views/projects/team.html.haml
  Diff comments   View file @088860d
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 .alert.alert-info 4 .alert.alert-info
5 = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do 5 = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
6 New Team Member 6 New Team Member
7 - %p  
8 - Read more about project permissions  
9 - %strong= link_to "here", help_permissions_path, :class => "vlink"  
10 - %p To open team member profile - click on avatar. 7 + Read more about project permissions
  8 + %strong= link_to "here", help_permissions_path, :class => "vlink"
  9 + %br
  10 + To open team member profile - click on avatar.
11 11
12 12
13 = render :partial => "team", :locals => {:project => @project} 13 = render :partial => "team", :locals => {:project => @project}