diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index ed083351a8f61969a0d35d89ebece97aeaa2af61..ec066d5bda1c80e53ce772fb06ab5b392f875460 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 f867b3589cdc7e0d1160692760a4074734f7a9e8..f85ec7213abdc6287712cf5a8ec581b4e665a5f2 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 – Issue # = issue.id diff --git a/app/views/dashboard/_merge_requests_feed.html.haml b/app/views/dashboard/_merge_requests_feed.html.haml index 7fb7998d537a430394cdd65bc2b32d2b07be5648..8f8bad3307cc48955a4c2f3474bd5a3f55eaa706 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 – 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 a5468fc625a76e7b96996ec4716afd87eebbe59c..479df95222642933f536aad00827e2a737e4600d 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 +   %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 391436f8bd64f0ea44688aa077b3155165b60446..742ce3490fc5b770318e206e001e18fc53818082 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}