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

Revert "webpack: Combine archive-style bundle into archive." 

This reverts commit d1d9d63841, and fixes
the fonts in webapp being overwritten by bootstarap due to webpack bundling.
This commit is contained in:
Priyank Patel 2018-07-24 21:21:22 +00:00 committed by Tim Abbott
parent c010a704de
commit 8a012b9e7f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/zerver/archive/index.html
View File

@ -15,6 +15,7 @@
{{ render_bundle('katex', attrs='nonce="%s"' % (csp_nonce)) }}
{{ render_bundle('portico') }}
{{ render_bundle('archive') }}
{{ render_bundle('archive-styles') }}
{% endblock %}

14
tools/webpack.assets.json
View File

@ -14,11 +14,7 @@
"./static/js/templates.js",
"./static/js/stream_color.js",
"./static/js/scroll_bar.js",
"./static/templates/compiled.js",
"./node_modules/katex/dist/katex.css",
"./static/styles/zulip.scss",
"./static/styles/media.scss",
"./static/styles/archive.scss"
"./static/templates/compiled.js"
],
"portico": [
"./static/js/portico/header.js",
@ -74,5 +70,11 @@
],
"translations": "./static/js/translations.js",
"zxcvbn": "./node_modules/zxcvbn/dist/zxcvbn.js",
"app": "./static/js/bundles/app.js"
"app": "./static/js/bundles/app.js",
"archive-styles": [
"./node_modules/katex/dist/katex.css",
"./static/styles/zulip.scss",
"./static/styles/media.scss",
"./static/styles/archive.scss"
]
}