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

webpack: Transition activity.css to use webpack. 

The activity.scss file is added to activity bundle.
This commit is contained in:
Priyank Patel 2018-05-03 13:05:30 +00:00 committed by Tim Abbott
parent c00a054893
commit c780bc33ba
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
static/styles/activity.css → static/styles/activity.scss
View File

1
templates/analytics/activity.html
View File

@ -10,7 +10,6 @@
{% block customhead %} {% block customhead %}
{{ super() }} {{ super() }}
{{ render_bundle('activity') }} {{ render_bundle('activity') }}
{% stylesheet 'activity' %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}

5
tools/webpack.assets.json
View File

@ -1,5 +1,8 @@
{ {
"activity": "./static/third/sorttable/sorttable.js", "activity": [
"./static/third/sorttable/sorttable.js",
"./static/styles/activity.scss"
],
"portico": [ "portico": [
"./static/js/portico/header.js", "./static/js/portico/header.js",
"./static/styles/portico-styles.scss" "./static/styles/portico-styles.scss"

7
zproject/settings.py
View File

@ -860,13 +860,6 @@ PIPELINE = {
'STYLESHEETS': { 'STYLESHEETS': {
# If you add a style here, please update stylesheets() # If you add a style here, please update stylesheets()
# in frontend_tests/zjsunit/output.js as needed. # in frontend_tests/zjsunit/output.js as needed.
'activity': {
'source_filenames': (
'styles/activity.css',
'third/thirdparty-fonts.css',
),
'output_filename': 'min/activity.css'
},
'stats': { 'stats': {
'source_filenames': ('styles/stats.css',), 'source_filenames': ('styles/stats.css',),
'output_filename': 'min/stats.css' 'output_filename': 'min/stats.css'