summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/images/emoji.pngbin1136910 -> 1135471 bytes
-rw-r--r--app/assets/images/emoji@2x.pngbin0 -> 2775918 bytes
-rw-r--r--app/assets/stylesheets/pages/emojis.scss8
3 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/images/emoji.png b/app/assets/images/emoji.png
index 44c4ac260ac..5e588d76d46 100644
--- a/app/assets/images/emoji.png
+++ b/app/assets/images/emoji.png
Binary files differ
diff --git a/app/assets/images/emoji@2x.png b/app/assets/images/emoji@2x.png
new file mode 100644
index 00000000000..9d9b07b8553
--- /dev/null
+++ b/app/assets/images/emoji@2x.png
Binary files differ
diff --git a/app/assets/stylesheets/pages/emojis.scss b/app/assets/stylesheets/pages/emojis.scss
index e99d60db419..153e0ce49af 100644
--- a/app/assets/stylesheets/pages/emojis.scss
+++ b/app/assets/stylesheets/pages/emojis.scss
@@ -1723,4 +1723,12 @@
background-repeat: no-repeat;
height: 20px;
width: 20px;
+
+ @media only screen and (-Webkit-min-device-pixel-ratio: 1.5),
+ only screen and (-moz-min-device-pixel-ratio: 1.5),
+ only screen and (-o-min-device-pixel-ratio: 3/2),
+ only screen and (min-device-pixel-ratio: 1.5) {
+ background-image: image-url('emoji@2x.png');
+ background-size: 840px 820px;
+ }
}