Merge pull request #295 from MITx/courseware-css

Courseware css

.gitignore

@@ -23,4 +23,5 @@ reports/
 *.egg-info
 Gemfile.lock
 .env/
-
+lms/static/sass/*.css
+cms/static/sass/*.css

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'

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";

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;
   }
 }

lms/templates/courseware.html

@@ -3,6 +3,10 @@
 <%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
 <%block name="js_extra">
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
 
@@ -23,7 +27,6 @@
   
   
    <%static:js group='courseware'/>
-   <%static:css group='course'/>
 
   <%include file="mathjax_include.html" />
 

lms/templates/info.html

 <%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
+
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
 <%include file="course_navigation.html" args="active_page='info'" />
 <%! 
   from courseware.courses import get_course_info_section

lms/templates/main.html

@@ -7,6 +7,7 @@
   <link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
 
   <%static:css group='application'/>
+
   <!--[if lte IE 9]>
   <%static:css group='ie-fixes'/>
   <![endif]-->

lms/templates/profile.html

 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
+
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
 <%namespace name="profile_graphs" file="profile_graphs.js"/>
 
 <%block name="title"><title>Profile - edX 6.002x</title></%block>

lms/templates/simplewiki/simplewiki_base.html

@@ -3,6 +3,10 @@
 <%inherit file="../main.html"/>
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
 <%!
   from django.core.urlresolvers import reverse
   from simplewiki.views import wiki_reverse
@@ -78,6 +82,7 @@
 <%include file="../course_navigation.html" args="active_page='wiki'" />
 %endif
 
+<section class="container">
 <section class="main-content">
   <div class="wiki-wrapper">
     <%block name="wiki_panel">
@@ -158,4 +163,5 @@
   </div>
 </section>
 
+</section>
 </%block>

lms/templates/staticbook.html

 <%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
 <%block name="title"><title>Textbook – MITx 6.002x</title></%block>
 
+<%block name="headextra">
+<%static:css group='course'/>
+</%block>
+
 <%block name="js_extra">
 <script>
 var page=${ page };
@@ -56,6 +61,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 +105,4 @@ $("#open_close_accordion a").click(function(){
     </section>
   </div>
 </section>
+</section>