From 15789e8eb507cef40f7c156c1920821d0ca9c352 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 19 Jun 2016 18:31:29 -0600
Subject: [PATCH] Emoji shouldn't have borders. #EmojiWithoutBorders

---
 app/assets/stylesheets/pages/help.scss     | 2 +-
 app/assets/stylesheets/pages/issuable.scss | 2 +-
 app/assets/stylesheets/pages/notes.scss    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index 204c0eea48..0b710ef168 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -59,7 +59,7 @@
   padding: 7px;
 
   // Border around images in the help pages.
-  img {
+  img:not(.emoji) {
     border: 1px solid $table-border-gray;
     padding: 5px;
     margin: 5px;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index bf6f44161d..21ff6ab71f 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -6,7 +6,7 @@
   }
 
   // Border around images in issue and MR descriptions.
-  .description img {
+  .description img:not(.emoji) {
     border: 1px solid $table-border-gray;
     padding: 5px;
     margin: 5px;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 44db5b156c..df0c241bbf 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -119,7 +119,7 @@ ul.notes {
         }
 
         // Border around images in issue and MR comments.
-        img {
+        img:not(.emoji) {
           border: 1px solid $table-border-gray;
           padding: 5px;
           margin: 5px 0;