paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder CSS Files to fix compose box issues.

Browse Source 
The media queries should always be last in the pipeline to be delivered
so that other styles don’t override them.
This commit is contained in:
Brock Whittaker
2016-10-31 11:34:40 -07:00
committed by Tim Abbott
parent d49076d0d4
commit 9ad27b3e69
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zproject/settings.py
View File

@@ -661,13 +661,13 @@ PIPELINE = {
'third/spectrum/spectrum.css', 'third/spectrum/spectrum.css',
'styles/components.css', 'styles/components.css',
'styles/zulip.css', 'styles/zulip.css',
'styles/media.css',
'styles/settings.css', 'styles/settings.css',
'styles/subscriptions.css', 'styles/subscriptions.css',
'styles/compose.css', 'styles/compose.css',
'styles/overlay.css', 'styles/overlay.css',
'styles/pygments.css', 'styles/pygments.css',
'styles/thirdparty-fonts.css', 'styles/thirdparty-fonts.css',
'styles/media.css',
# We don't want fonts.css on QtWebKit, so its omitted here # We don't want fonts.css on QtWebKit, so its omitted here
), ),
'output_filename': 'min/app-fontcompat.css' 'output_filename': 'min/app-fontcompat.css'
@@ -679,7 +679,6 @@ PIPELINE = {
'third/jquery-perfect-scrollbar/css/perfect-scrollbar.css', 'third/jquery-perfect-scrollbar/css/perfect-scrollbar.css',
'styles/components.css', 'styles/components.css',
'styles/zulip.css', 'styles/zulip.css',
'styles/media.css',
'styles/settings.css', 'styles/settings.css',
'styles/subscriptions.css', 'styles/subscriptions.css',
'styles/compose.css', 'styles/compose.css',
@@ -687,6 +686,7 @@ PIPELINE = {
'styles/pygments.css', 'styles/pygments.css',
'styles/thirdparty-fonts.css', 'styles/thirdparty-fonts.css',
'styles/fonts.css', 'styles/fonts.css',
'styles/media.css',
), ),
'output_filename': 'min/app.css' 'output_filename': 'min/app.css'
}, },