From 05b9e6cab2efe656130f4f8104209788fe534e65 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 25 Sep 2012 15:32:57 -0400
Subject: [PATCH] Standardize more of css between lms and cms

---
 cms/envs/common.py                            |  7 ++++-
 cms/static/sass/_base.scss                    |  4 +++
 .../xmodule/xmodule/css/sequence/display.scss |  2 +-
 .../xmodule/xmodule/css/video/display.scss    |  5 +++-
 .../static/css/vendor/jquery.qtip.min.css     |  0
 lms/envs/common.py                            | 12 ++++++--
 .../sass/course/courseware/_courseware.scss   | 28 -------------------
 7 files changed, 24 insertions(+), 34 deletions(-)
 rename {lms => common}/static/css/vendor/jquery.qtip.min.css (100%)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 4a4fcaf5e7..3832006aba 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -215,7 +215,12 @@ module_js = remove_root(
 
 PIPELINE_CSS = {
     'base-style': {
-        'source_filenames': ['sass/base-style.scss'],
+        'source_filenames': [
+            'js/vendor/CodeMirror/codemirror.css',
+            'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css',
+            'css/vendor/jquery.qtip.min.css',
+            'sass/base-style.scss'
+        ],
         'output_filename': 'css/cms-base-style.css',
     },
 }
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index cd8b709a3b..06822ecdc6 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -171,6 +171,10 @@ label {
 //
 // -------------------------------------
 
+.xmodule_display {
+    font-size: 16px;
+}
+
 input.courseware-unit-search-input {
 	position: absolute;
 	right: 0;
diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss
index 94d6a201c7..e006e02773 100644
--- a/common/lib/xmodule/xmodule/css/sequence/display.scss
+++ b/common/lib/xmodule/xmodule/css/sequence/display.scss
@@ -356,7 +356,7 @@ nav.sequence-bottom {
   }
 }
 
-div.course-wrapper section.course-content ol.vert-mod > li ul.sequence-nav-buttons {
+.xmodule_VerticalModule ol.vert-mod > li ul.sequence-nav-buttons {
   list-style: none !important;
 }
 
diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss
index 2f58ae6d6e..af204b2cc1 100644
--- a/common/lib/xmodule/xmodule/css/video/display.scss
+++ b/common/lib/xmodule/xmodule/css/video/display.scss
@@ -1,3 +1,7 @@
+& {
+    margin-bottom: 30px;
+}
+
 div.video {
   @include clearfix();
   background: #f3f3f3;
@@ -5,7 +9,6 @@ div.video {
   margin: 0 -12px;
   padding: 12px;
   border-radius: 5px;
-  font-size: 16px;
 
   article.video-wrapper {
     float: left;
diff --git a/lms/static/css/vendor/jquery.qtip.min.css b/common/static/css/vendor/jquery.qtip.min.css
similarity index 100%
rename from lms/static/css/vendor/jquery.qtip.min.css
rename to common/static/css/vendor/jquery.qtip.min.css
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 256b1afd0c..3bcf0931d4 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -442,9 +442,15 @@ PIPELINE_CSS = {
         'output_filename': 'css/lms-application.css',
     },
     'course': {
-      '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',
-      },
+        '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': {
         'source_filenames': ['sass/ie.scss'],
         'output_filename': 'css/lms-ie.css',
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index 010d47ba29..2f5af0317a 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -163,25 +163,6 @@ div.course-wrapper {
       font-family: Consolas, "Lucida Console", Monaco, "Courier New", Courier, monospace;
     }
 
-    div.ui-slider {
-      border: 1px solid #aaa;
-      background: #ddd;
-      @include box-shadow(inset 0 1px 0 #eee);
-      @include border-radius(0);
-
-      a.ui-slider-handle {
-        @include box-shadow(inset 0 1px 0 lighten($pink, 10%));
-        background: $pink url(../images/slider-bars.png) center center no-repeat;
-        border: 1px solid darken($pink, 20%);
-        cursor: pointer;
-
-        &:hover, &:focus {
-          background-color: lighten($pink, 10%);
-          outline: none;
-        }
-      }
-    }
-
     div.ui-tabs {
       border: 0;
       @include border-radius(0);
@@ -234,12 +215,3 @@ div.course-wrapper {
     }
   }
 }
-
-.xmodule_VideoModule {
-  margin-bottom: 30px;
-
-  
-}
-
-
-