summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-19 18:31:29 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-19 18:31:29 -0600
commit15789e8eb507cef40f7c156c1920821d0ca9c352 (patch)
tree83d2497abaeeecb39c584bc600d01726e987b51c
parent8685b3f80a9a653849776a83b7a968725a8ae1f0 (diff)
downloadgitlab-ce-15789e8eb507cef40f7c156c1920821d0ca9c352.tar.gz
Emoji shouldn't have borders. #EmojiWithoutBorders
-rw-r--r--app/assets/stylesheets/pages/help.scss2
-rw-r--r--app/assets/stylesheets/pages/issuable.scss2
-rw-r--r--app/assets/stylesheets/pages/notes.scss2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index 204c0eea487..0b710ef168b 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 bf6f44161df..21ff6ab71f0 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 44db5b156ce..df0c241bbf1 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;