From 04a87cb5c475b4ffcb5670e6fe83667a30763256 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 26 Aug 2014 10:05:08 +0300
Subject: [PATCH] Round avatars for notes timeline

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/generic/timeline.scss   | 6 ++++--
 app/views/projects/notes/_discussion.html.haml | 2 +-
 app/views/projects/notes/_note.html.haml       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/generic/timeline.scss b/app/assets/stylesheets/generic/timeline.scss
index ed28d168a77..f29cf25fa4c 100644
--- a/app/assets/stylesheets/generic/timeline.scss
+++ b/app/assets/stylesheets/generic/timeline.scss
@@ -10,7 +10,7 @@
     content: " ";
     width: 3px;
     background-color: #eeeeee;
-    margin-left: 25px;
+    margin-left: 29px;
   }
 
   .timeline-entry {
@@ -42,11 +42,13 @@
         background: #fff;
         color: #737881;
         float: left;
-        @include border-radius(4px);
+        @include border-radius(40px);
         @include box-shadow(0 0 0 3px #EEE);
+        overflow: hidden;
 
         .avatar {
           margin: 0;
+          padding: 0;
         }
       }
 
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index c4ea97dd769..f4c6fad2fed 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -2,7 +2,7 @@
 .timeline-entry
   .timeline-entry-inner
     .timeline-icon
-      = image_tag avatar_icon(note.author_email), class: "avatar s32"
+      = image_tag avatar_icon(note.author_email), class: "avatar s40"
     .timeline-content
       - if note.for_merge_request?
         - if note.outdated?
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 223abe5da78..90fc554e987 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -1,7 +1,7 @@
 %li.timeline-entry{ id: dom_id(note), class: dom_class(note), data: { discussion: note.discussion_id } }
   .timeline-entry-inner
     .timeline-icon
-      = image_tag avatar_icon(note.author_email), class: "avatar s32"
+      = image_tag avatar_icon(note.author_email), class: "avatar s40"
     .timeline-content
       .note-header
         .note-actions
-- 
GitLab