Commit 00596d2f by Kyle Fiedler

Added courseware css back into the main template

parent d1482e19
...@@ -23,4 +23,5 @@ reports/ ...@@ -23,4 +23,5 @@ reports/
*.egg-info *.egg-info
Gemfile.lock Gemfile.lock
.env/ .env/
lms/static/sass/*.css
cms/static/sass/*.css
...@@ -303,7 +303,7 @@ PIPELINE_CSS = { ...@@ -303,7 +303,7 @@ PIPELINE_CSS = {
'output_filename': 'css/application.css', 'output_filename': 'css/application.css',
}, },
'course': { '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', 'output_filename': 'css/course.css',
}, },
'ie-fixes': { 'ie-fixes': {
...@@ -312,7 +312,7 @@ PIPELINE_CSS = { ...@@ -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 = [ courseware_only_js = [
PROJECT_ROOT / 'static/coffee/src/' + pth + '.coffee' PROJECT_ROOT / 'static/coffee/src/' + pth + '.coffee'
......
...@@ -10,13 +10,20 @@ ...@@ -10,13 +10,20 @@
// Course styles // Course styles
@import 'course/courseware_subnav'; @import 'course/courseware_subnav';
@import 'module/module-styles.scss';
// Courseware styles // Courseware styles
@import 'course/old/base/variables'; @import 'course/old/base/variables';
@import 'course/old/base/extends'; @import 'course/old/base/extends';
@import 'course/old/base/functions'; @import 'course/old/base/functions';
@import 'course/old/courseware/courseware'; @import 'course/old/courseware/courseware';
@import 'course/old/courseware/sidebar'; @import 'course/old/courseware/sidebar';
@import 'course/old/courseware/amplifier'; @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";
...@@ -52,7 +52,6 @@ nav.course-material { ...@@ -52,7 +52,6 @@ nav.course-material {
margin-top: 30px; margin-top: 30px;
.courseware { .courseware {
background: rgb(240,240,240); min-height: 300px;
height: 600px;
} }
} }
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
<%static:js group='courseware'/> <%static:js group='courseware'/>
<%static:css group='course'/>
<%include file="mathjax_include.html" /> <%include file="mathjax_include.html" />
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
<link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" /> <link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
<%static:css group='application'/> <%static:css group='application'/>
<%static:css group='course'/>
<!--[if lte IE 9]> <!--[if lte IE 9]>
<%static:css group='ie-fixes'/> <%static:css group='ie-fixes'/>
<![endif]--> <![endif]-->
......
...@@ -56,6 +56,7 @@ $("#open_close_accordion a").click(function(){ ...@@ -56,6 +56,7 @@ $("#open_close_accordion a").click(function(){
<%include file="course_navigation.html" args="active_page='book'" /> <%include file="course_navigation.html" args="active_page='book'" />
<section class="container">
<section class="main-content"> <section class="main-content">
<div class="book-wrapper"> <div class="book-wrapper">
...@@ -99,3 +100,4 @@ $("#open_close_accordion a").click(function(){ ...@@ -99,3 +100,4 @@ $("#open_close_accordion a").click(function(){
</section> </section>
</div> </div>
</section> </section>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment