diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-01 13:28:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 13:28:39 -0400 |
| commit | d79e538d278a15fa795f913b4e8025d3f39351f6 (patch) | |
| tree | 3d852d8e60b93713e104a2c50d489659c6366ad0 /webapp/make-emojis | |
| parent | 0cc5854b64756010c1d3e85a2021bf7a7010e63b (diff) | |
| download | chat-d79e538d278a15fa795f913b4e8025d3f39351f6.tar.gz chat-d79e538d278a15fa795f913b4e8025d3f39351f6.tar.bz2 chat-d79e538d278a15fa795f913b4e8025d3f39351f6.zip | |
PLT-7262 Stopped including emoji sprite sheets multiple times in CSS (#7077)
* PLT-7262 Stopped including emoji sprite sheets multiple times in CSS
* Changed EmojiPickerItem to be a PureComponent
Diffstat (limited to 'webapp/make-emojis')
| -rwxr-xr-x | webapp/make-emojis | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webapp/make-emojis b/webapp/make-emojis index 2de199b54..d104fc2bf 100755 --- a/webapp/make-emojis +++ b/webapp/make-emojis @@ -165,6 +165,8 @@ categories.each do |category| end end + css_rules << ".emoji-category-#{category} { background-image: url('../images/emoji-sheets/#{category}.png'); }" + SpriteFactory.run!( tmp_directory, :layout => :packed, @@ -175,9 +177,9 @@ categories.each do |category| ) do |images| images.each do |name, image| if image[:cssw] != 64 || image[:cssh] != 64 - css_rules << ".emoji-#{name} { background-image: url(../images/emoji-sheets/#{category}.png); background-position: -#{image[:cssx]}px -#{image[:cssy]}px; width: #{image[:cssw]}px; height: #{image[:cssh]}px; }" + css_rules << ".emoji-#{name} { background-position: -#{image[:cssx]}px -#{image[:cssy]}px; width: #{image[:cssw]}px; height: #{image[:cssh]}px; }" else - css_rules << ".emoji-#{name} { background-image: url(../images/emoji-sheets/#{category}.png); background-position: -#{image[:cssx]}px -#{image[:cssy]}px; }" + css_rules << ".emoji-#{name} { background-position: -#{image[:cssx]}px -#{image[:cssy]}px; }" end end end |