From 64b92c35cc9422ee52314cf382da09bbb3e09591 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 20 Jul 2012 19:54:07 -0400 Subject: [PATCH] Include ie fixes in via django-pipeline --- lms/envs/common.py | 6 +++++- lms/static/sass/ie.scss | 3 +++ lms/templates/main.html | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index c8989d1b3c..8d256db02e 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -294,9 +294,13 @@ PIPELINE_CSS = { 'source_filenames': ['sass/application.scss'], 'output_filename': 'css/application.css', }, + 'ie-fixes': { + 'source_filenames': ['sass/ie.scss'], + 'output_filename': 'css/ie.css', + }, } -PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss'] +PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss', 'sass/ie.scss'] PIPELINE_JS = { 'application': { diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss index a160513d1a..e7da93c335 100644 --- a/lms/static/sass/ie.scss +++ b/lms/static/sass/ie.scss @@ -1,3 +1,6 @@ +@import "bourbon/bourbon"; +@import "base/variables"; + // These are all quick solutions for IE please rewrite .highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview, .home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1, diff --git a/lms/templates/main.html b/lms/templates/main.html index 2c9e00081d..be4fa3bd70 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -9,6 +9,9 @@ % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: <%static:css group='application'/> + % endif % if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: