diff --git a/.gitignore b/.gitignore index ef2f6bbe16..28b78aedbc 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ reports/ *.egg-info Gemfile.lock .env/ - +lms/static/sass/*.css +cms/static/sass/*.css diff --git a/lms/envs/common.py b/lms/envs/common.py index 643c43a561..b1fbbb9bab 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -303,7 +303,7 @@ PIPELINE_CSS = { 'output_filename': 'css/application.css', }, 'course': { - 'source_filenames': ['sass/application.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'], 'output_filename': 'css/course.css', }, 'ie-fixes': { @@ -312,7 +312,7 @@ PIPELINE_CSS = { }, } -PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss', 'sass/ie.scss'] +PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss', 'sass/ie.scss', 'sass/course.scss'] courseware_only_js = [ PROJECT_ROOT / 'static/coffee/src/' + pth + '.coffee' diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss index b42acad5ee..3e04f2b7eb 100644 --- a/lms/static/sass/course.scss +++ b/lms/static/sass/course.scss @@ -10,13 +10,20 @@ // Course styles @import 'course/courseware_subnav'; +@import 'module/module-styles.scss'; // Courseware styles @import 'course/old/base/variables'; @import 'course/old/base/extends'; @import 'course/old/base/functions'; + @import 'course/old/courseware/courseware'; @import 'course/old/courseware/sidebar'; @import 'course/old/courseware/amplifier'; -@import 'module/module-styles.scss'; +@import 'course/old/courseware/problems'; + +@import "course/old/info"; + +@import "course/old/plugins/jquery-ui-1.8.16.custom", "course/old/plugins/jquery.qtip.min"; +@import "course/old/textbook"; diff --git a/lms/static/sass/course/_courseware_subnav.scss b/lms/static/sass/course/_courseware_subnav.scss index e109d2fba7..7d2433138e 100644 --- a/lms/static/sass/course/_courseware_subnav.scss +++ b/lms/static/sass/course/_courseware_subnav.scss @@ -52,7 +52,6 @@ nav.course-material { margin-top: 30px; .courseware { - background: rgb(240,240,240); - height: 600px; + min-height: 300px; } } diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html index 464760f8da..93595a2098 100644 --- a/lms/templates/courseware.html +++ b/lms/templates/courseware.html @@ -23,7 +23,6 @@ <%static:js group='courseware'/> - <%static:css group='course'/> <%include file="mathjax_include.html" /> diff --git a/lms/templates/main.html b/lms/templates/main.html index 9af7121cf1..c9b74c669c 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -7,6 +7,8 @@ <%static:css group='application'/> + <%static:css group='course'/> + diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html index cc95a49644..bed80f8c87 100644 --- a/lms/templates/staticbook.html +++ b/lms/templates/staticbook.html @@ -56,6 +56,7 @@ $("#open_close_accordion a").click(function(){ <%include file="course_navigation.html" args="active_page='book'" /> + @@ -99,3 +100,4 @@ $("#open_close_accordion a").click(function(){ +