Restyled last push widget. Increased line-height for td in tables

7 files changed, 22 insertions, 18 deletions

diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 25efc9eeaae..6a0794cfd44 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -1,6 +1,10 @@
 = render 'admin/shared/projects_head'
 %h3.page_title
   Groups
+  %small
+    allows you to keep projects organized.
+    Use groups for uniting related projects.
+
   = link_to 'New Group', new_admin_group_path, class: "btn small right"
 %br
 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index dc520a22641..6c4ff96bb50 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -1,6 +1,7 @@
 - if @projects.any?
   .projects
     .activities.span8
+      = render "events/event_last_push", event: @last_push
       = render 'shared/no_ssh'
       - if @events.any?
         .content_list= render @events
@@ -8,7 +9,6 @@
         %h4.nothing_here_message Projects activity will be displayed here
       .loading.hide
     .side
-      = render "events/event_last_push", event: @last_push
       - if @groups.present?
         = render "groups", groups: @groups
       = render "projects", projects: @projects
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index d70be70c8df..e15f1ac063c 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,13 +1,15 @@
 - if show_last_push_widget?(event)
   .event_lp
-    %div
-      = image_tag gravatar_icon(event.author_email), class: "avatar"
-      %span You pushed to
-      = event.ref_type
-      = link_to project_commits_path(event.project, event.ref_name) do
-        %strong= truncate(event.ref_name, length: 28)
-      at
-      %strong= link_to event.project.name, event.project
+    = image_tag "event_push.png"
+     
+    %span You pushed to
+    = link_to project_commits_path(event.project, event.ref_name) do
+      %strong= truncate(event.ref_name, length: 28)
+    at
+    %strong= link_to event.project.name, event.project
+    %span
+      = time_ago_in_words(event.created_at)
+      ago.
 
-      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn very_small" do
-        Create Merge Request
+    = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do
+      Create Merge Request
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index cd86a01f276..72d7ad9a592 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,5 +1,6 @@
 .projects
   .activities.span8
+    = render "events/event_last_push", event: @last_push
     = link_to dashboard_path, class: 'btn very_small' do
       ← To dashboard
      
@@ -12,7 +13,6 @@
       %h4.nothing_here_message Projects activity will be displayed here
     .loading.hide
   .side
-    = render "events/event_last_push", event: @last_push
     = render "projects", projects: @projects
     %div
       %span.rss-icon
diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml
index a0af8eea44c..9d4485cf9a4 100644
--- a/app/views/keys/_show.html.haml
+++ b/app/views/keys/_show.html.haml
@@ -1,8 +1,7 @@
 %tr
   %td
     = link_to key_path(key) do
-      %p
-        %strong= key.title
+      %strong= key.title
   %td
     %span.cgray
       Added
diff --git a/app/views/projects/files.html.haml b/app/views/projects/files.html.haml
index ce8ba876065..9f7efcdc515 100644
--- a/app/views/projects/files.html.haml
+++ b/app/views/projects/files.html.haml
@@ -4,14 +4,13 @@
     %thead
       %tr
         %th File name
-        %th 
+        %th
 
     - @notes.each do |note|
       %tr
         %td
           %a{href: note.attachment.url}
-            = image_tag gravatar_icon(note.author_email), class: "left", width: 16
-             
+            = image_tag gravatar_icon(note.author_email), class: "avatar s24"
             = note.attachment_identifier
         %td
           Added
diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml
index a0c88b5987f..26d13533b5c 100644
--- a/app/views/team_members/_team.html.haml
+++ b/app/views/team_members/_team.html.haml
@@ -1,5 +1,5 @@
 - grouper_project_members(@project).each do |access, members|
-  %table
+  %table.low
     %thead
       %tr
         %th.span7