Added courseware css back into the main template
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -23,4 +23,5 @@ reports/
|
||||
*.egg-info
|
||||
Gemfile.lock
|
||||
.env/
|
||||
|
||||
lms/static/sass/*.css
|
||||
cms/static/sass/*.css
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -52,7 +52,6 @@ nav.course-material {
|
||||
margin-top: 30px;
|
||||
|
||||
.courseware {
|
||||
background: rgb(240,240,240);
|
||||
height: 600px;
|
||||
min-height: 300px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
|
||||
<%static:js group='courseware'/>
|
||||
<%static:css group='course'/>
|
||||
|
||||
<%include file="mathjax_include.html" />
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
<link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
|
||||
|
||||
<%static:css group='application'/>
|
||||
<%static:css group='course'/>
|
||||
|
||||
<!--[if lte IE 9]>
|
||||
<%static:css group='ie-fixes'/>
|
||||
<![endif]-->
|
||||
|
||||
@@ -56,6 +56,7 @@ $("#open_close_accordion a").click(function(){
|
||||
|
||||
<%include file="course_navigation.html" args="active_page='book'" />
|
||||
|
||||
<section class="container">
|
||||
<section class="main-content">
|
||||
<div class="book-wrapper">
|
||||
|
||||
@@ -99,3 +100,4 @@ $("#open_close_accordion a").click(function(){
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
Reference in New Issue
Block a user