From 257ce0430f14bdff84bd93f2e572af6c8ae8637c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 30 Jul 2012 16:18:22 -0400 Subject: [PATCH] Moved vendor sass files to css folder and included them in --- lms/envs/common.py | 2 +- .../vendor/jquery-ui-1.8.16.custom.css} | 0 .../_jquery.qtip.min.scss => css/vendor/jquery.qtip.min.css} | 0 lms/static/sass/course.scss | 2 -- 4 files changed, 1 insertion(+), 3 deletions(-) rename lms/static/{sass/course/plugins/_jquery-ui-1.8.16.custom.scss => css/vendor/jquery-ui-1.8.16.custom.css} (100%) rename lms/static/{sass/course/plugins/_jquery.qtip.min.scss => css/vendor/jquery.qtip.min.css} (100%) diff --git a/lms/envs/common.py b/lms/envs/common.py index 83ad08daa3..4f84aba93a 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -304,7 +304,7 @@ PIPELINE_CSS = { 'output_filename': 'css/lms-application.css', }, 'course': { - 'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css'], + 'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/jquery-ui-1.8.16.custom.css', 'css/vendor/jquery.qtip.min.css'], 'output_filename': 'css/lms-course.css', }, 'ie-fixes': { diff --git a/lms/static/sass/course/plugins/_jquery-ui-1.8.16.custom.scss b/lms/static/css/vendor/jquery-ui-1.8.16.custom.css similarity index 100% rename from lms/static/sass/course/plugins/_jquery-ui-1.8.16.custom.scss rename to lms/static/css/vendor/jquery-ui-1.8.16.custom.css diff --git a/lms/static/sass/course/plugins/_jquery.qtip.min.scss b/lms/static/css/vendor/jquery.qtip.min.css similarity index 100% rename from lms/static/sass/course/plugins/_jquery.qtip.min.scss rename to lms/static/css/vendor/jquery.qtip.min.css diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss index 618aceda48..4e84ebfadb 100644 --- a/lms/static/sass/course.scss +++ b/lms/static/sass/course.scss @@ -11,8 +11,6 @@ // Course base / layout styles @import 'course/layout/courseware_subnav'; @import 'course/base/extends'; -@import "course/plugins/jquery-ui-1.8.16.custom", "course/plugins/jquery.qtip.min"; - @import 'module/module-styles.scss'; // courseware