paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

css: Transition 'app.css' to SCSS.

Browse Source 
This commit transitions all styles in app.css in the Django pipeline
to being compiled by webpack in an app-styles bundle, and renames the
various files to now be processed as SCSS.

To implement this transition, we move the old CSS file refernces in
settings.py and replace them with a bundle declared in
`webpack.assets.json` and includedn in the index.html template

Tweaked by tabbott to keep the list of files in `app.css` in
`webpack.assets.json`, and to preserve the ordering from the old
`settings.py`.
This commit is contained in:
Armaan Ahluwalia
2018-05-01 17:19:19 +05:30
committed by Tim Abbott
parent 64dadae697
commit 5f7b47e20c
28 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
zproject/settings.py
View File

@@ -877,39 +877,6 @@ PIPELINE = {
),
'output_filename': 'min/landing.css'
},
'app': {
'source_filenames': (
'third/bootstrap-notify/css/bootstrap-notify.css',
'third/spectrum/spectrum.css',
'third/thirdparty-fonts.css',
'generated/icons/style.css',
'node_modules/katex/dist/katex.css',
'node_modules/flatpickr/dist/flatpickr.css',
'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css',
'styles/components.css',
'styles/app_components.css',
'styles/zulip.css',
'styles/alerts.css',
'styles/settings.css',
'styles/subscriptions.css',
'styles/drafts.css',
'styles/input_pill.css',
'styles/informational-overlays.css',
'styles/compose.css',
'styles/reactions.css',
'styles/left-sidebar.css',
'styles/right-sidebar.css',
'styles/lightbox.css',
'styles/popovers.css',
'styles/pygments.css',
'styles/fonts.css',
'styles/media.css',
'styles/typing_notifications.css',
'styles/hotspots.css',
'styles/night_mode.css',
),
'output_filename': 'min/app.css'
},
'common': {
'source_filenames': (
'third/bootstrap/css/bootstrap.css',