From d563654ec3bbb67e8a58df573291ca942b32e495 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 24 Apr 2017 12:41:08 -0500
Subject: Reduce image margin; show all system note icons

---
 app/assets/stylesheets/framework/typography.scss |  2 +-
 app/assets/stylesheets/pages/notes.scss          | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 76d1adee3f2..96d8a812723 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -8,7 +8,7 @@
 
   img {
     max-width: 100%;
-    margin: 0 0 $gl-padding;
+    margin: 0 0 8px;
   }
 
   p a:not(.no-attachment-icon) img {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 68bb90f39ed..69a95db6920 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -254,18 +254,6 @@ ul.notes {
         }
       }
     }
-
-    .timeline-icon {
-      display: none;
-
-      .avatar {
-        visibility: hidden;
-
-        .discussion-body & {
-          visibility: visible;
-        }
-      }
-    }
   }
 }
 
-- 
cgit v1.2.1