Merge branch 'master' of github.com:MITx/mitx into discussion2

Gemfile

 source :rubygems
-
+ruby "1.9.3"
 gem 'rake'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'

cms/static/sass/_content-types.scss

@@ -56,10 +56,10 @@
 
 .module a:first-child {
   @extend .content-type;
-  background-image: url('/static/img/content-types/module.png');
+  background-image: url('../img/content-types/module.png');
 }
 
 .module a:first-child {
   @extend .content-type;
-  background-image: url('/static/img/content-types/module.png');
+  background-image: url('../img/content-types/module.png');
 }

common/lib/xmodule/xmodule/css/sequence/display.scss

@@ -3,8 +3,9 @@ nav.sequence-nav {
   // import from external sources.
   @extend .topbar;
 
-  border-bottom: 1px solid darken($cream, 20%);
-  margin-bottom: $body-line-height;
+  border-bottom: 1px solid #ddd;
+  margin: (-(lh())) (-(lh())) lh() (-(lh()));
+  background: #eee;
   position: relative;
   @include border-top-right-radius(4px);
 
@@ -12,6 +13,8 @@ nav.sequence-nav {
     @include box-sizing(border-box);
     display: table;
     height: 100%;
+    margin: 0;
+    padding-left: 0;
     padding-right: flex-grid(1, 9);
     width: 100%;
 
@@ -20,7 +23,7 @@ nav.sequence-nav {
     }
 
     li {
-      border-left: 1px solid darken($cream, 20%);
+      border-left: 1px solid #eee;
       display: table-cell;
       min-width: 20px;
 
@@ -32,17 +35,15 @@ nav.sequence-nav {
         background-repeat: no-repeat;
 
         &:hover {
-          background-color: lighten($cream, 3%);
+          background-color: #eee;
         }
       }
 
       .visited {
-        background-color: #DCCDA2;
+        background-color: #ddd;
         background-repeat: no-repeat;
-        @include box-shadow(inset 0 0 3px darken(#dccda2, 10%));
 
         &:hover {
-          background-color: $cream;
           background-position: center center;
         }
       }
@@ -214,7 +215,7 @@ nav.sequence-nav {
       &.prev, &.next {
 
         a {
-          background-color: darken($cream, 5%);
+          // background-color: darken($cream, 5%);
           background-position: center center;
           background-repeat: no-repeat;
           border-left: 1px solid darken(#f6efd4, 20%);
@@ -241,7 +242,7 @@ nav.sequence-nav {
           background-image: url('../images/sequence-nav/previous-icon.png');
 
           &:hover {
-            background-color: $cream;
+            // background-color: $cream;
           }
         }
       }
@@ -251,7 +252,7 @@ nav.sequence-nav {
           background-image: url('../images/sequence-nav/next-icon.png');
 
           &:hover {
-            background-color: $cream;
+            // background-color: $cream;
           }
         }
       }
@@ -273,9 +274,8 @@ nav.sequence-bottom {
 
   ul {
     @extend .clearfix;
-    background-color: darken(#F6EFD4, 5%);
-    background-color: darken($cream, 5%);
-    border: 1px solid darken(#f6efd4, 20%);
+    background-color: #eee;
+    border: 1px solid #ddd;
     @include border-radius(3px);
     @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
     @include inline-block();
@@ -297,14 +297,13 @@ nav.sequence-bottom {
           width: 45px;
 
           &:hover {
-            background-color: $cream;
-            color: darken($cream, 60%);
+            background-color: #ddd;
+            color: #000;
             opacity: .5;
             text-decoration: none;
           }
 
           &.disabled {
-            background-color: lighten($cream, 10%);
             opacity: .4;
           }
         }

common/lib/xmodule/xmodule/css/video/display.scss

@@ -114,14 +114,13 @@ div.video {
         @extend .dullify;
         float: left;
         list-style: none;
-        margin-right: lh();
+        margin: 0 lh() 0 0;
         padding: 0;
 
         li {
           float: left;
           margin-bottom: 0;
 
-
           a {
             border-bottom: none;
             border-right: 1px solid #000;
@@ -183,6 +182,8 @@ div.video {
             ol.video_speeds {
               display: block;
               opacity: 1;
+              padding: 0;
+              margin: 0;
             }
           }
 
@@ -210,6 +211,7 @@ div.video {
               font-weight: normal;
               letter-spacing: 1px;
               padding: 0 lh(.25) 0 lh(.5);
+              line-height: 46px;
               text-transform: uppercase;
             }
 
@@ -218,6 +220,7 @@ div.video {
               font-weight: bold;
               margin-bottom: 0;
               padding: 0 lh(.5) 0 0;
+              line-height: 46px;
             }
 
             &:hover, &:active, &:focus {
@@ -422,10 +425,12 @@ div.video {
   }
 
   ol.subtitles {
+    padding-left: 0;
     float: left;
     max-height: 460px;
     overflow: auto;
     width: flex-grid(3, 9);
+    margin: 0;
 
     li {
       border: 0;

create-dev-env.sh

@@ -17,9 +17,11 @@ ouch() {
     !! ERROR !!
 
     The last command did not complete successfully, 
-    see $LOG for more details or trying running the
+    For more details or trying running the
     script again with the -v flag.  
     
+    Output of the script is recorded in $LOG
+
 EOL
     printf '\E[0m'
 
@@ -36,7 +38,7 @@ usage() {
     Usage: $PROG [-c] [-v] [-h]
     
             -c        compile scipy and numpy
-            -s        do _not_ set --no-site-packages for virtualenv
+            -s        give access to global site-packages for virtualenv 
             -v        set -x + spew
             -h        this
 
@@ -61,26 +63,19 @@ clone_repos() {
     if [[ -d "$BASE/mitx/.git" ]]; then
         output "Pulling mitx"
         cd "$BASE/mitx"
-        git pull >>$LOG
+        git pull 
     else
         output "Cloning mitx"
         if [[ -d "$BASE/mitx" ]]; then
             mv "$BASE/mitx" "${BASE}/mitx.bak.$$"
         fi
-        git clone git@github.com:MITx/mitx.git >>$LOG 
+        git clone git@github.com:MITx/mitx.git
     fi
      
-    cd "$BASE"
-    if [[ -d "$BASE/askbot-devel/.git" ]]; then
-        output "Pulling askbot-devel"
-        cd "$BASE/askbot-devel"
-        git pull >>$LOG
-    else
-        output "Cloning askbot-devel"
-        if [[ -d "$BASE/askbot-devel" ]]; then
-            mv "$BASE/askbot-devel" "${BASE}/askbot-devel.bak.$$"
-        fi
-        git clone git@github.com:MITx/askbot-devel >>$LOG 
+    if [[ ! -d "$BASE/mitx/askbot/.git" ]]; then
+        output "Cloning askbot as a submodule of mitx"
+        cd "$BASE/mitx"
+        git submodule update --init
     fi
     
     # By default, dev environments start with a copy of 6.002x
@@ -90,14 +85,14 @@ clone_repos() {
     if [[ -d "$BASE/data/$REPO/.git" ]]; then
         output "Pulling $REPO"
         cd "$BASE/data/$REPO"
-        git pull >>$LOG
+        git pull 
     else
         output "Cloning $REPO"
         if [[ -d "$BASE/data/$REPO" ]]; then
             mv "$BASE/data/$REPO" "${BASE}/data/$REPO.bak.$$"
         fi
 	cd "$BASE/data"
-        git clone git@github.com:MITx/$REPO >>$LOG
+        git clone git@github.com:MITx/$REPO 
     fi
 }
 
@@ -109,8 +104,8 @@ RUBY_VER="1.9.3"
 NUMPY_VER="1.6.2"
 SCIPY_VER="0.10.1"
 BREW_FILE="$BASE/mitx/brew-formulas.txt"
-LOG="/var/tmp/install.log"
-APT_PKGS="curl git mercurial python-virtualenv build-essential python-dev gfortran liblapack-dev libfreetype6-dev libpng12-dev libxml2-dev libxslt-dev yui-compressor coffeescript"
+LOG="/var/tmp/install-$(date +%Y%m%d-%H%M%S).log"
+APT_PKGS="curl git python-virtualenv build-essential python-dev gfortran liblapack-dev libfreetype6-dev libpng12-dev libxml2-dev libxslt-dev yui-compressor coffeescript"
 
 if [[ $EUID -eq 0 ]]; then
     error "This script should not be run using sudo or as the root user"
@@ -163,23 +158,30 @@ cat<<EO
 
   To compile scipy and numpy from source use the -c option
 
-  Most of STDOUT is redirected to /var/tmp/install.log, run
-  $ tail -f /var/tmp/install.log
-  to monitor progress
+  !!! Do not run this script from an existing virtualenv !!!
+  
+  If you are in a ruby/python virtualenv please start a new
+  shell. 
 
 EO
 info
 output "Press return to begin or control-C to abort"
 read dummy
 
-if [[ -f $HOME/.rvmrc ]]; then
-    output "$HOME/.rvmrc alredy exists, not adding $RUBY_DIR"
-else
-    output "Creating $HOME/.rmrc so rvm uses $RUBY_DIR"
+# log all stdout and stderr 
+exec > >(tee $LOG)
+exec 2>&1
+
+if ! grep -q "export rvm_path=$RUBY_DIR" ~/.rvmrc; then
+    if [[ -f $HOME/.rvmrc ]]; then
+        output "Copying existing .rvmrc to .rvmrc.bak"
+        cp $HOME/.rvmrc $HOME/.rvmrc.bak
+    fi
+    output "Creating $HOME/.rvmrc so rvm uses $RUBY_DIR"
     echo "export rvm_path=$RUBY_DIR" > $HOME/.rvmrc
 fi
+
 mkdir -p $BASE
-rm -f $LOG
 case `uname -s` in
     [Ll]inux)
         command -v lsb_release &>/dev/null || {
@@ -207,11 +209,7 @@ case `uname -s` in
         } 
         command -v git &>/dev/null || {
             output "Installing git"
-            brew install git >> $LOG
-        }
-        command -v hg &>/dev/null || {
-            output "Installaing mercurial"
-            brew install mercurial >> $LOG
+            brew install git 
         }
 
         clone_repos
@@ -225,17 +223,19 @@ case `uname -s` in
         for pkg in $(cat $BREW_FILE); do
             grep $pkg <(brew list) &>/dev/null || {
                 output "Installing $pkg"
-                brew install $pkg  >>$LOG 
+                brew install $pkg  
             }
         done
         command -v pip &>/dev/null || {
             output "Installing pip"
-            sudo easy_install pip  >>$LOG 
-        }
-        command -v virtualenv &>/dev/null || {
-            output "Installing virtualenv"
-            sudo pip install virtualenv virtualenvwrapper >> $LOG
+            sudo easy_install pip  
         }
+
+        if ! grep -Eq ^1.7 <(virtualenv --version 2>/dev/null); then
+            output "Installing virtualenv >1.7"
+            sudo pip install 'virtualenv>1.7' virtualenvwrapper
+        fi
+
         command -v coffee &>/dev/null || {
             output "Installing coffee script"
             curl http://npmjs.org/install.sh | sh
@@ -253,10 +253,12 @@ curl -sL get.rvm.io | bash -s stable
 source $RUBY_DIR/scripts/rvm
 # skip the intro 
 LESS="-E" rvm install $RUBY_VER
-if [[ -n $systempkgs ]]; then
-    virtualenv "$PYTHON_DIR"
+if [[ $systempkgs ]]; then
+    virtualenv --system-site-packages "$PYTHON_DIR"
 else
-    virtualenv --no-site-packages "$PYTHON_DIR"
+    # default behavior for virtualenv>1.7 is 
+    # --no-site-packages
+    virtualenv  "$PYTHON_DIR"
 fi
 source $PYTHON_DIR/bin/activate
 output "Installing gem bundler"
@@ -277,24 +279,24 @@ if [[ -n $compile ]]; then
     rm -f numpy.tar.gz scipy.tar.gz
     output "Compiling numpy"
     cd "$BASE/numpy-${NUMPY_VER}"
-    python setup.py install >>$LOG  2>&1
+    python setup.py install 
     output "Compiling scipy"
     cd "$BASE/scipy-${SCIPY_VER}"
-    python setup.py install >>$LOG  2>&1
+    python setup.py install 
     cd "$BASE"
     rm -rf numpy-${NUMPY_VER} scipy-${SCIPY_VER}
 fi
 
-output "Installing askbot requirements"
-pip install -r askbot-devel/askbot_requirements.txt >>$LOG 
-output "Installing askbot-dev requirements"
-pip install -r askbot-devel/askbot_requirements_dev.txt >>$LOG 
 output "Installing MITx pre-requirements"
-pip install -r mitx/pre-requirements.txt >> $LOG
+pip install -r mitx/pre-requirements.txt 
 # Need to be in the mitx dir to get the paths to local modules right
 output "Installing MITx requirements"
 cd mitx
-pip install -r requirements.txt >>$LOG 
+pip install -r requirements.txt 
+output "Installing askbot requirements"
+pip install -r askbot/askbot_requirements.txt 
+pip install -r askbot/askbot_requirements_dev.txt 
+
 
 mkdir "$BASE/log" || true
 mkdir "$BASE/db" || true

lms/askbot/skins/mitx/templates/base.html

@@ -20,7 +20,7 @@
         {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #}
         {# include "widgets/secondary_header.html" #} {# Scope selector, search input and ask button #}
 
-        <section class="main-content">
+        <section class="container">
             {% block body %}
             {% endblock %}
         </section>

lms/askbot/skins/mitx/templates/meta/html_head_stylesheets.html

 {% load extra_filters_jinja %}
 <!--<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />-->
 {{ 'application' | compressed_css }}
+{{ 'course' | compressed_css }}

lms/askbot/skins/mitx/templates/navigation.jinja.html

-<header class="app" aria-label="Global Navigation">
+<header class="global" aria-label="Global Navigation">
   <nav>
-    <a href="{{ MITX_ROOT_URL }}" class="logo">
-      <img src="/static/images/logo.png" />
-    </a>
-
-    {%if request.user.is_authenticated(): %}
-    <h1>Circuits and Electronics</h1>
-    <ol class="user">
-      <li>
-        <a href="/dashboard" class="user-dashboard">
-          <span class="avatar"><img src="/static/images/profile.jpg" /></span>
-          {{ request.user.username }}
-        </a>
-      </li>
-      <li>
-        <a href="#" class="options">&#9662</a>
-        <ol class="user-options">
-          <li><a href="#">Account Settings</a></li>
-          <li><a href="/logout">Log Out</a></li>
-        </ol>
+    <h1 class="logo"><a href="${reverse('root')}"></a></h1>
+    <ol class="left">
+      <li class="primary">
+        <a href="${reverse('courses')}">Find Courses</a>
       </li>
     </ol>
-    {%else:%}
-    <ol>
-      <li><a href="/courses">Courses</a></li>
-      <li><a href="#">How It Works</a></li>
-    </ol>
+
     <ol class="user">
-      <li><a href="/dashboard">Log In</a></li>
-      <li><a href="#">Sign Up</a></li>
-    </ol>
-    <ol class="secondary">
-      <li>
-        <a href="#">About</a>
-      </li>
-      <li>
-        <a href="#">Jobs</a>
+      <li class="primary">
+        <a href="${reverse('dashboard')}" class="user-link">
+          <span class="avatar"></span>
+          ${user.username}
+        </a>
       </li>
-      <li>
-        <a href="#">faq</a>
+      <li class="primary">
+        <a href="#" class="dropdown">&#9662</a>
+        <ul class="dropdown-menu">
+          ##          <li><a href="#">Account Settings</a></li>
+          <li><a href="${reverse('help_edx')}">Help</a></li>
+          <li><a href="${reverse('logout')}">Log Out</a></li>
+        </ul>
       </li>
     </ol>
-    {%endif %}
   </nav>
 </header>

lms/askbot/skins/mitx/templates/widgets/footer.html

 <!-- template footer.html -->
-  <footer>
-    <!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
-    <p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a>
-</p>
+<footer>
   <nav>
-      <ul class="social">
-        <li class="linkedin">
-          <a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a>
-        </li>
-        <li class="twitter">
-          <a href="https://twitter.com/#!/MyMITx">Twitter</a>
-        </li>
-        <li class="facebook">
-          <a href="http://www.facebook.com/pages/MITx/378592442151504">Facebook</a>
-        </li>
-      </ul>
-    <ul>
+    <section class="top">
+      <section class="primary">
+        <a href="${reverse('root')}" class="logo"></a>
+        <a href="${reverse('courses')}">Find Courses</a>
+        <a href="${reverse('about_edx')}">About</a>
+        <a href="http://edxonline.tumblr.com/">Blog</a>
+        <a href="${reverse('jobs')}">Jobs</a>
+        <a href="${reverse('contact')}">Contact</a>
+      </section>
+
+      <section class="social">
+        <a href="http://youtube.com/user/edxonline"><img src="${static.url('images/social/youtube-sharing.png')}" /></a>
+        <a href="https://plus.google.com/108235383044095082735"><img src="${static.url('images/social/google-plus-sharing.png')}" /></a>
+        <a href="http://www.facebook.com/EdxOnline"><img src="${static.url('images/social/facebook-sharing.png')}" /></a>
+        <a href="https://twitter.com/edXOnline"><img src="${static.url('images/social/twitter-sharing.png')}" /></a>
+      </section>
+    </section>
+
+    <section class="bottom">
+      <section class="copyright">
+        <p style="float:left;">&copy; 2012 edX, some rights reserved.</p>
+      </section>
+
+      <section class="secondary">
+        <a href="${reverse('tos')}">Terms of Service</a>
+        <a href="${reverse('privacy_edx')}">Privacy Policy</a>
+        <a href="${reverse('honor')}">Honor Code</a>
+        <a href="${reverse('help_edx')}">Help</a>
+      </section>
+    </section>
 
-      <li><a href="/s/help.html">Help</a></li>
-      <li><a href="/logout">Log out</a></li>
-    </ul>
   </nav>
-  </footer>
+</footer>
 
 <!-- end template footer.html -->

lms/envs/common.py

@@ -306,7 +306,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', 'css/vendor/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css'],
+      'source_filenames': ['js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css', 'sass/course.scss'],
       'output_filename': 'css/lms-course.css',
       },
     'ie-fixes': {

lms/envs/test.py

@@ -54,6 +54,7 @@ GITHUB_REPO_ROOT = ENV_ROOT / "data"
 STATICFILES_DIRS = [
     COMMON_ROOT / "static",
     PROJECT_ROOT / "static",
+    ASKBOT_ROOT / "askbot" / "skins",
 ]
 STATICFILES_DIRS += [
     (course_dir, COMMON_TEST_DATA_ROOT / course_dir)

lms/static/sass/course/_help.scss

-section.help.main-content {
-  padding: lh();
-
-  h1 {
-    border-bottom: 1px solid #ddd;
-    margin-bottom: lh();
-    margin-top: 0;
-    padding-bottom: lh();
-  }
-
-  p {
-    max-width: 700px;
-  }
-
-  h2 {
-    margin-top: 0;
-  }
-
-  section.self-help {
-    float: left;
-    margin-bottom: lh();
-    margin-right: flex-gutter();
-    width: flex-grid(6);
-
-    ul {
-      margin-left: flex-gutter(6);
-
-      li {
-        margin-bottom: lh(.5);
-      }
-    }
-  }
-
-  section.help-email {
-    float: left;
-    width: flex-grid(6);
-
-    dl {
-      display: block;
-      margin-bottom: lh();
-
-      dd {
-        margin-bottom: lh();
-      }
-
-      dt {
-        clear: left;
-        float: left;
-        font-weight: bold;
-        width: flex-grid(2, 6);
-      }
-    }
-  }
-}

lms/static/sass/course/base/_base.scss

@@ -5,3 +5,11 @@ body {
 h1, h2, h3, h4, h5, h6 {
   font-family: $sans-serif;
 }
+
+table {
+  table-layout: fixed;
+}
+
+.container {
+  padding: lh(2);
+}

lms/static/sass/course/base/_extends.scss

@@ -84,7 +84,8 @@ h1.top-header {
 }
 
 .sidebar {
-  border-right: 1px solid #d3d3d3;
+  border-right: 1px solid #C8C8C8;
+  @include box-shadow(inset -1px 0 0 #e6e6e6);
   @include box-sizing(border-box);
   display: table-cell;
   font-family: $sans-serif;
@@ -181,7 +182,6 @@ h1.top-header {
 
 .topbar {
   @extend .clearfix;
-  background: $cream;
   border-bottom: 1px solid darken($cream, 10%);
   border-top: 1px solid #fff;
   font-size: 12px;

lms/static/sass/course/courseware/_courseware.scss

@@ -3,22 +3,6 @@ html {
   max-height: 100%;
 }
 
-body.courseware {
-  height: 100%;
-  max-height: 100%;
-
-  .container {
-    padding-bottom: 40px;
-    margin-top: 20px;
-  }
-
-  footer {
-    &.fixed-bottom {
-      Position: static;
-    }
-  }
-}
-
 div.course-wrapper {
   @extend .table-wrapper;
 
@@ -59,6 +43,9 @@ div.course-wrapper {
     }
 
     ol.vert-mod {
+      padding: 0;
+      margin: 0;
+
       > li {
         @extend .clearfix;
         @extend .problem-set;

lms/static/sass/course/courseware/_sidebar.scss

@@ -13,44 +13,50 @@ section.course-index {
   div#accordion {
 
     h3 {
-      @include box-shadow(inset 0 1px 0 0 #eee);
-      border-top: 1px solid #d3d3d3;
-      overflow: hidden;
+      @include border-radius(0);
+      border-top: 1px solid #e3e3e3;
       margin: 0;
+      overflow: hidden;
 
       &:first-child {
         border: none;
       }
 
       &:hover {
-        @include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
+        background: #eee;
       }
 
       &.ui-accordion-header {
         color: #000;
 
         a {
-          font-size: $body-font-size;
+          @include border-radius(0);
+          @include box-shadow(none);
           color: lighten($text-color, 10%);
+          font-size: $body-font-size;
         }
 
         &.ui-state-active {
-          @include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
           @extend .active;
-          border-bottom: 1px solid #d3d3d3;
+          border-bottom: none;
+
+          &:hover {
+            background: none;
+          }
         }
       }
     }
 
     ul.ui-accordion-content {
       @include border-radius(0);
-      @include box-shadow(inset -1px 0 0 #e6e6e6);
+      background: #FFF;
       border: none;
       font-size: 12px;
       margin: 0;
       padding: 1em 1.5em;
 
       li {
+        @include border-radius(0);
         margin-bottom: lh(.5);
 
         a {
@@ -120,8 +126,6 @@ section.course-index {
           font-weight: bold;
 
           > a {
-            background: rgb(240,240,240);
-            @include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(230,230,230)));
             border-color: rgb(200,200,200);
 
             &:after {

lms/static/sass/course/discussion/_discussion.scss

 // Generic layout styles for the discussion forums
-
 body.askbot {
-
-  section.main-content {
+  section.container {
     div.discussion-wrapper {
       @extend .table-wrapper;
 

lms/static/sass/course/layout/_courseware_subnav.scss

 nav.course-material {
-  background: rgb(210,210,210);
   @include clearfix;
   @include box-sizing(border-box);
-  @include box-shadow(inset 0 1px 5px 0 rgba(0,0,0, 0.05));
-  border-bottom: 1px solid rgb(190,190,190);
+  background: #f6f6f6;
+  border-bottom: 1px solid rgb(200,200,200);
   margin: 0px auto 0px;
   padding: 0px;
   width: 100%;
@@ -24,12 +23,14 @@ nav.course-material {
       list-style: none;
 
       a {
-        color: $lighter-base-font-color;
+        color: darken($lighter-base-font-color, 20%);
         display: block;
         text-align: center;
-        padding: 5px 13px;
+        padding: 8px 13px 12px;
+        font-size: 14px;
+        font-weight: 400;
         text-decoration: none;
-        text-shadow: 0 1px rgba(255,255,255, 0.4);
+        text-shadow: 0 1px rgb(255,255,255);
 
         &:hover {
           color: $base-font-color;
@@ -41,7 +42,7 @@ nav.course-material {
           border-bottom: 0px;
           @include border-top-radius(4px);
           @include box-shadow(0 2px 0 0 rgba(255,255,255, 1));
-          color: $base-font-color;
+          color: $blue;
         }
       }
     }

lms/templates/courseware.html

@@ -18,14 +18,6 @@
   ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/xml/xml.js')}"></script>
   ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/python/python.js')}"></script>
 
-  ## image input: for clicking on images (see imageinput.html)
-  <script type="text/javascript" src="${static.url('js/vendor/imageinput.js')}"></script>
-
-  ## TODO (cpennington): Remove this when we have a good way for modules to specify js to load on the page
-  ## and in the wiki
-  <script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
-  
-  
    <%static:js group='courseware'/>
 
   <%include file="discussion/_js_dependencies.html" />
@@ -48,7 +40,6 @@
   <div class="course-wrapper">
     <section aria-label="Course Navigation" class="course-index">
       <header id="open_close_accordion">
-        <h2>Courseware Index</h2>
         <a href="#">close</a>
       </header>