Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

css: Use the Zulip static asset pipeline for emoji sprite sheet CSS. 

This should be a nonfunctional change in most cases; the main benefit
should be preventing caching issues if/when our sprite sheets change.
This commit is contained in:
Tim Abbott 2017-05-09 19:11:02 -07:00
parent 3d5350408b
commit c21d336bfe
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/index.html
View File

@ -14,7 +14,7 @@ var page_params = {{ page_params }};
{% block customhead %}
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="/static/images/logo/apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed">
<link rel="stylesheet" type="text/css" href="/static/generated/emoji/google_sprite.css" />
{% stylesheet 'google_sprite' %}
<style type="text/css">
#css-loading {

24
zproject/settings.py
View File

@ -755,6 +755,30 @@ PIPELINE = {
),
'output_filename': 'min/common.css'
},
'apple_sprite': {
'source_filenames': (
'generated/emoji/google_sprite.css',
),
'output_filename': 'min/google_sprite.css',
},
'emojione_sprite': {
'source_filenames': (
'generated/emoji/google_sprite.css',
),
'output_filename': 'min/google_sprite.css',
},
'google_sprite': {
'source_filenames': (
'generated/emoji/google_sprite.css',
),
'output_filename': 'min/google_sprite.css',
},
'twitter_sprite': {
'source_filenames': (
'generated/emoji/google_sprite.css',
),
'output_filename': 'min/google_sprite.css',
},
},
'JAVASCRIPT': {},
}