From 9ad27b3e69af3ae10a4a31cb0d25e33724e64954 Mon Sep 17 00:00:00 2001
From: Brock Whittaker <brock@zulipchat.com>
Date: Mon, 31 Oct 2016 11:34:40 -0700
Subject: [PATCH] Reorder CSS Files to fix compose box issues.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The media queries should always be last in the pipeline to be delivered
so that other styles don’t override them.
---
 zproject/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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