home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'award-emoji-retina' into 'master'

Browse Source 
Award emoji supports retina displays

Based on discussion in !2800

There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is.

Before:

![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png)

After:

![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png)

Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348

cc\ @rspeicher @vsizov 

See merge request !2891
This commit is contained in:
Jacob Schatz
2016-02-21 21:06:58 +01:00
committed by Rémy Coutable
parent 20b3be6e24
commit f79bb559e2
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/images/emoji.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 257 KiB

app/assets/images/emoji@2x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 674 KiB

app/assets/stylesheets/pages/emojis.scss
+10
View File
@@ -1723,4 +1723,14 @@
background-repeat: no-repeat;
height: 20px;
width: 20px;
@media only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min--moz-device-pixel-ratio: 2),
only screen and (-o-min-device-pixel-ratio: 2/1),
only screen and (min-device-pixel-ratio: 2),
only screen and (min-resolution: 192dpi),
only screen and (min-resolution: 2dppx) {
background-image: image-url('emoji@2x.png');
background-size: 840px 820px;
}
}