Merge pull request #485 from MITx/feature/kfiedler/courseware-style

Fix for CSM Sass and fix headers in tutorials 

cms/static/sass/_base.scss

@@ -14,6 +14,10 @@ $yellow: #fff8af;
 $cream: #F6EFD4;
 $border-color: #ddd;
 
+// edX colors
+$blue: rgb(29,157,217);
+$pink: rgb(182,37,104);
+
 @mixin hide-text {
   background-color: transparent;
   border:           0;

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

@@ -58,18 +58,20 @@ div.course-wrapper {
           @extend h1.top-header;
           @include border-radius(0 4px 0 0);
           margin-bottom: -16px;
+          border-bottom: 0;
 
           h1 {
             margin: 0;
+            font-size: 1em;
           }
 
           h2 {
             float: right;
-            margin-right: 0;
-            margin-top: 8px;
+            margin: 12px 0 0;
             text-align: right;
             padding-right: 0;
             border-right: 0;
+            font-size: em(14, 24);
           }
         }