From 088860de4ed3a10b824092c6ab3c47d9f6f27d6a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 11 Apr 2012 23:50:13 +0300
Subject: [PATCH] feed few fixes

---
 app/assets/stylesheets/common.scss                 | 8 ++++++++
 app/views/dashboard/_issues_feed.html.haml         | 2 +-
 app/views/dashboard/_merge_requests_feed.html.haml | 2 +-
 app/views/dashboard/_projects_feed.html.haml       | 1 +
 app/views/projects/team.html.haml                  | 8 ++++----
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index ed083351..ec066d5b 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -881,6 +881,14 @@ li.note {
 
 .remember_me { 
   text-align:left;
+
+  input { 
+    margin:0;
+  }
+
+  span { 
+    padding-left:5px;
+  }
 }
 
 
diff --git a/app/views/dashboard/_issues_feed.html.haml b/app/views/dashboard/_issues_feed.html.haml
index f867b358..f85ec721 100644
--- a/app/views/dashboard/_issues_feed.html.haml
+++ b/app/views/dashboard/_issues_feed.html.haml
@@ -3,7 +3,7 @@
     = link_to [issue.project, issue] do 
       %p
         %strong
-          %span.pretty_label= issue.project.name
+          %span= issue.project.name
           &ndash;
           Issue #
           = issue.id
diff --git a/app/views/dashboard/_merge_requests_feed.html.haml b/app/views/dashboard/_merge_requests_feed.html.haml
index 7fb7998d..8f8bad33 100644
--- a/app/views/dashboard/_merge_requests_feed.html.haml
+++ b/app/views/dashboard/_merge_requests_feed.html.haml
@@ -3,7 +3,7 @@
     = link_to [merge_request.project, merge_request] do 
       %p
         %strong
-          %span.pretty_label= merge_request.project.name
+          %strong= merge_request.project.name
           &ndash;
           Merge Request ##{merge_request.id}
         = truncate merge_request.title, :length => 50
diff --git a/app/views/dashboard/_projects_feed.html.haml b/app/views/dashboard/_projects_feed.html.haml
index a5468fc6..479df952 100644
--- a/app/views/dashboard/_projects_feed.html.haml
+++ b/app/views/dashboard/_projects_feed.html.haml
@@ -4,6 +4,7 @@
       = link_to project, :class => "project_link" do 
         %span.ico.project
         = truncate project.name, :length => 24
+      &nbsp;
       %small
         last activity at 
         = project.last_activity_date.stamp("Aug 25, 2011")
diff --git a/app/views/projects/team.html.haml b/app/views/projects/team.html.haml
index 391436f8..742ce349 100644
--- a/app/views/projects/team.html.haml
+++ b/app/views/projects/team.html.haml
@@ -4,10 +4,10 @@
   .alert.alert-info
     = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do 
       New Team Member
-    %p 
-      Read more about project permissions 
-      %strong= link_to "here", help_permissions_path, :class => "vlink"
-    %p To open team member profile - click on avatar. 
+    Read more about project permissions 
+    %strong= link_to "here", help_permissions_path, :class => "vlink"
+    %br
+    To open team member profile - click on avatar. 
 
 
 = render :partial => "team", :locals => {:project => @project}