Merge pull request openedx#321 from MITx/feature/kfiedler/courseware-…

…style Fixed jquery ui image problem and added a base style sheet for lms to ov...
jazkarta · Jul 31, 2012 · dc53397 · dc53397
2 parents cadd4ef + ccb7bbb
commit dc53397
Show file tree

Hide file tree

Showing 119 changed files with 120 additions and 1,056 deletions.
diff --git a/...static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/...static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/...static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/...static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/common/static/css/vendor/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/common/static/css/vendor/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
diff --git a/common/static/css/vendor/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/common/static/css/vendor/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/common/static/css/vendor/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/common/static/css/vendor/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/...mages_old/ui-bg_glass_65_ffffff_1x400.png → ...ss/images/ui-bg_glass_65_ffffff_1x400.png b/...mages_old/ui-bg_glass_65_ffffff_1x400.png → ...ss/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/...on/static/css/vendor/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/...on/static/css/vendor/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/...static/css/vendor/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/...static/css/vendor/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/.../static/css/vendor/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/.../static/css/vendor/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/...ic/images_old/ui-icons_454545_256x240.png → ...htness/images/ui-icons_222222_256x240.png b/...ic/images_old/ui-icons_454545_256x240.png → ...htness/images/ui-icons_222222_256x240.png
diff --git a/...ic/images_old/ui-icons_fa720a_256x240.png → ...htness/images/ui-icons_228ef1_256x240.png b/...ic/images_old/ui-icons_fa720a_256x240.png → ...htness/images/ui-icons_228ef1_256x240.png
diff --git a/common/static/css/vendor/ui-lightness/images/ui-icons_ef8c08_256x240.png b/common/static/css/vendor/ui-lightness/images/ui-icons_ef8c08_256x240.png
diff --git a/common/static/css/vendor/ui-lightness/images/ui-icons_ffd27a_256x240.png b/common/static/css/vendor/ui-lightness/images/ui-icons_ffd27a_256x240.png
diff --git a/...ic/images_old/ui-icons_ffffff_256x240.png → ...htness/images/ui-icons_ffffff_256x240.png b/...ic/images_old/ui-icons_ffffff_256x240.png → ...htness/images/ui-icons_ffffff_256x240.png
diff --git a/...ic/css/vendor/jquery-ui-1.8.16.custom.css → .../ui-lightness/jquery-ui-1.8.22.custom.css b/...ic/css/vendor/jquery-ui-1.8.16.custom.css → .../ui-lightness/jquery-ui-1.8.22.custom.css
diff --git a/common/static/js/vendor/jquery-1.6.2.min.js b/common/static/js/vendor/jquery-1.6.2.min.js
diff --git a/common/static/js/vendor/jquery-ui-1.8.16.custom.min.js b/common/static/js/vendor/jquery-ui-1.8.16.custom.min.js
diff --git a/common/static/js/vendor/jquery-ui.min.js b/common/static/js/vendor/jquery-ui.min.js
diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -304,7 +304,7 @@
         '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.16.custom.css', 'css/vendor/jquery.qtip.min.css'],
+      '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'],
       'output_filename': 'css/lms-course.css',
       },
     'ie-fixes': {

diff --git a/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png b/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png b/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png
diff --git a/lms/static/images/ui-bg_flat_55_ffffff_40x100.png b/lms/static/images/ui-bg_flat_55_ffffff_40x100.png
diff --git a/lms/static/images/ui-bg_flat_75_ffffff_40x100.png b/lms/static/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/lms/static/images/ui-bg_glass_65_023063_1x400.png b/lms/static/images/ui-bg_glass_65_023063_1x400.png
diff --git a/lms/static/images/ui-bg_glass_65_ffffff_1x400.png b/lms/static/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png b/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png
diff --git a/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png b/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png
diff --git a/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png b/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
diff --git a/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png b/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png
diff --git a/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png b/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png
diff --git a/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png b/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png
diff --git a/lms/static/images/ui-icons_031634_256x240.png b/lms/static/images/ui-icons_031634_256x240.png
diff --git a/lms/static/images/ui-icons_454545_256x240.png b/lms/static/images/ui-icons_454545_256x240.png
diff --git a/lms/static/images/ui-icons_adcc80_256x240.png b/lms/static/images/ui-icons_adcc80_256x240.png
diff --git a/lms/static/images/ui-icons_fa720a_256x240.png b/lms/static/images/ui-icons_fa720a_256x240.png
diff --git a/lms/static/images/ui-icons_ffffff_256x240.png b/lms/static/images/ui-icons_ffffff_256x240.png
diff --git a/lms/static/images_old/amplifier-slider-handle.png b/lms/static/images_old/amplifier-slider-handle.png
diff --git a/lms/static/images_old/askbot/comment-vote-up.png b/lms/static/images_old/askbot/comment-vote-up.png
diff --git a/lms/static/images_old/askbot/search-icon.png b/lms/static/images_old/askbot/search-icon.png
diff --git a/lms/static/images_old/askbot/vote-arrow-down-activate.png b/lms/static/images_old/askbot/vote-arrow-down-activate.png
diff --git a/lms/static/images_old/askbot/vote-arrow-down.png b/lms/static/images_old/askbot/vote-arrow-down.png
diff --git a/lms/static/images_old/askbot/vote-arrow-up-activate.png b/lms/static/images_old/askbot/vote-arrow-up-activate.png
diff --git a/lms/static/images_old/askbot/vote-arrow-up.png b/lms/static/images_old/askbot/vote-arrow-up.png
diff --git a/lms/static/images_old/askbot/wmd-buttons.png b/lms/static/images_old/askbot/wmd-buttons.png
diff --git a/lms/static/images_old/bullet-triangle.png b/lms/static/images_old/bullet-triangle.png
diff --git a/lms/static/images_old/calc-icon.png b/lms/static/images_old/calc-icon.png
diff --git a/lms/static/images_old/cc.png b/lms/static/images_old/cc.png
diff --git a/lms/static/images_old/close-calc-icon.png b/lms/static/images_old/close-calc-icon.png
diff --git a/lms/static/images_old/closed-arrow.png b/lms/static/images_old/closed-arrow.png
diff --git a/lms/static/images_old/correct-icon.png b/lms/static/images_old/correct-icon.png
diff --git a/lms/static/images_old/css/.xcf b/lms/static/images_old/css/.xcf
diff --git a/lms/static/images_old/css/bottomWrapper-bg.jpg b/lms/static/images_old/css/bottomWrapper-bg.jpg
diff --git a/lms/static/images_old/css/footerWrapper-bg.jpg b/lms/static/images_old/css/footerWrapper-bg.jpg
diff --git a/lms/static/images_old/css/hat.jpg b/lms/static/images_old/css/hat.jpg
diff --git a/lms/static/images_old/css/hmenu-sel.jpg b/lms/static/images_old/css/hmenu-sel.jpg
diff --git a/lms/static/images_old/css/hmenu.jpg b/lms/static/images_old/css/hmenu.jpg
diff --git a/lms/static/images_old/css/page-bg.jpg b/lms/static/images_old/css/page-bg.jpg
diff --git a/lms/static/images_old/css/page-vbg.jpg b/lms/static/images_old/css/page-vbg.jpg
diff --git a/lms/static/images_old/css/topBanner-old.xcf b/lms/static/images_old/css/topBanner-old.xcf
diff --git a/lms/static/images_old/css/topBanner.jpg b/lms/static/images_old/css/topBanner.jpg
diff --git a/lms/static/images_old/css/topBanner.png b/lms/static/images_old/css/topBanner.png
diff --git a/lms/static/images_old/css/topBanner.xcf b/lms/static/images_old/css/topBanner.xcf
diff --git a/lms/static/images_old/css/topWrapper-bg.jpg b/lms/static/images_old/css/topWrapper-bg.jpg
diff --git a/lms/static/images_old/document-download.png b/lms/static/images_old/document-download.png
diff --git a/lms/static/images_old/facebook.png b/lms/static/images_old/facebook.png
diff --git a/lms/static/images_old/favicon.ico b/lms/static/images_old/favicon.ico
diff --git a/lms/static/images_old/fullscreen.png b/lms/static/images_old/fullscreen.png
diff --git a/lms/static/images_old/incorrect-icon.png b/lms/static/images_old/incorrect-icon.png
diff --git a/lms/static/images_old/info-icon.png b/lms/static/images_old/info-icon.png
diff --git a/lms/static/images_old/linkedin.png b/lms/static/images_old/linkedin.png
diff --git a/lms/static/images_old/marketing/circuits-bg.jpg b/lms/static/images_old/marketing/circuits-bg.jpg
diff --git a/lms/static/images_old/marketing/circuits-medium-bg.jpg b/lms/static/images_old/marketing/circuits-medium-bg.jpg
diff --git a/lms/static/images_old/marketing/course-bg-large.jpg b/lms/static/images_old/marketing/course-bg-large.jpg
diff --git a/lms/static/images_old/marketing/course-bg-medium.jpg b/lms/static/images_old/marketing/course-bg-medium.jpg
diff --git a/lms/static/images_old/marketing/course-bg-small.jpg b/lms/static/images_old/marketing/course-bg-small.jpg
diff --git a/lms/static/images_old/marketing/edx-logo.png b/lms/static/images_old/marketing/edx-logo.png
diff --git a/lms/static/images_old/marketing/facebook.png b/lms/static/images_old/marketing/facebook.png
diff --git a/lms/static/images_old/marketing/link-arrow.png b/lms/static/images_old/marketing/link-arrow.png
diff --git a/lms/static/images_old/marketing/linkedin.png b/lms/static/images_old/marketing/linkedin.png
diff --git a/lms/static/images_old/marketing/mit-logo.png b/lms/static/images_old/marketing/mit-logo.png
diff --git a/lms/static/images_old/marketing/shot-1-large.jpg b/lms/static/images_old/marketing/shot-1-large.jpg
diff --git a/lms/static/images_old/marketing/shot-1-medium.jpg b/lms/static/images_old/marketing/shot-1-medium.jpg
diff --git a/lms/static/images_old/marketing/shot-2-large.jpg b/lms/static/images_old/marketing/shot-2-large.jpg
diff --git a/lms/static/images_old/marketing/shot-3-large.jpg b/lms/static/images_old/marketing/shot-3-large.jpg
diff --git a/lms/static/images_old/marketing/shot-4-large.jpg b/lms/static/images_old/marketing/shot-4-large.jpg
diff --git a/lms/static/images_old/marketing/shot-5-large.jpg b/lms/static/images_old/marketing/shot-5-large.jpg
diff --git a/lms/static/images_old/marketing/shot-5-medium.jpg b/lms/static/images_old/marketing/shot-5-medium.jpg
diff --git a/lms/static/images_old/marketing/twitter.png b/lms/static/images_old/marketing/twitter.png
diff --git a/lms/static/images_old/open-arrow.png b/lms/static/images_old/open-arrow.png
diff --git a/lms/static/images_old/pause-icon.png b/lms/static/images_old/pause-icon.png
diff --git a/lms/static/images_old/play-icon.png b/lms/static/images_old/play-icon.png
diff --git a/lms/static/images_old/slide-left-icon.png b/lms/static/images_old/slide-left-icon.png
diff --git a/lms/static/images_old/slide-right-icon.png b/lms/static/images_old/slide-right-icon.png
diff --git a/lms/static/images_old/slider-bars.png b/lms/static/images_old/slider-bars.png
diff --git a/lms/static/images_old/slider-handle.png b/lms/static/images_old/slider-handle.png
diff --git a/lms/static/images_old/treeview-default.gif b/lms/static/images_old/treeview-default.gif
diff --git a/lms/static/images_old/twitter.png b/lms/static/images_old/twitter.png
diff --git a/lms/static/images_old/ui-bg_flat_0_aaaaaa_40x100.png b/lms/static/images_old/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/lms/static/images_old/ui-bg_flat_0_eeeeee_40x100.png b/lms/static/images_old/ui-bg_flat_0_eeeeee_40x100.png
diff --git a/lms/static/images_old/ui-bg_flat_55_ffffff_40x100.png b/lms/static/images_old/ui-bg_flat_55_ffffff_40x100.png
diff --git a/lms/static/images_old/ui-bg_flat_75_ffffff_40x100.png b/lms/static/images_old/ui-bg_flat_75_ffffff_40x100.png
diff --git a/lms/static/images_old/ui-bg_glass_65_023063_1x400.png b/lms/static/images_old/ui-bg_glass_65_023063_1x400.png
diff --git a/lms/static/images_old/ui-bg_highlight-soft_100_7fbcdf_1x100.png b/lms/static/images_old/ui-bg_highlight-soft_100_7fbcdf_1x100.png
diff --git a/lms/static/images_old/ui-bg_highlight-soft_100_bddeff_1x100.png b/lms/static/images_old/ui-bg_highlight-soft_100_bddeff_1x100.png
diff --git a/lms/static/images_old/ui-bg_highlight-soft_100_f6f6f6_1x100.png b/lms/static/images_old/ui-bg_highlight-soft_100_f6f6f6_1x100.png
diff --git a/lms/static/images_old/ui-bg_highlight-soft_25_7fbcdf_1x100.png b/lms/static/images_old/ui-bg_highlight-soft_25_7fbcdf_1x100.png
diff --git a/lms/static/images_old/ui-bg_highlight-soft_25_bddeff_1x100.png b/lms/static/images_old/ui-bg_highlight-soft_25_bddeff_1x100.png
diff --git a/lms/static/images_old/ui-bg_highlight-soft_50_7fbcfd_1x100.png b/lms/static/images_old/ui-bg_highlight-soft_50_7fbcfd_1x100.png
diff --git a/lms/static/images_old/ui-icons_031634_256x240.png b/lms/static/images_old/ui-icons_031634_256x240.png
diff --git a/lms/static/images_old/ui-icons_adcc80_256x240.png b/lms/static/images_old/ui-icons_adcc80_256x240.png
diff --git a/lms/static/images_old/unanswered-icon.png b/lms/static/images_old/unanswered-icon.png
diff --git a/lms/static/images_old/vcr.png b/lms/static/images_old/vcr.png
diff --git a/lms/static/images_old/video-image.png b/lms/static/images_old/video-image.png
diff --git a/lms/static/js/jquery-ui.min.js b/lms/static/js/jquery-ui.min.js
diff --git a/lms/static/js/jquery.min.js b/lms/static/js/jquery.min.js
diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss
@@ -10,6 +10,7 @@
 
 // Course base / layout styles
 @import 'course/layout/courseware_subnav';
+@import 'course/base/base';
 @import 'course/base/extends';
 @import 'module/module-styles.scss';
 

diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss
@@ -0,0 +1,7 @@
+body {
+  font-family: $sans-serif;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: $sans-serif;
+}
diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
@@ -130,9 +130,9 @@ h1.top-header {
       @include transition();
     }
 
-    span.ui-icon {
-      background-image: url(../images/ui-icons_454545_256x240.png);
-    }
+    // span.ui-icon {
+    //   background-image: url(../images/ui-icons_454545_256x240.png);
+    // }
 
     &.active {
       border-bottom: 1px solid #d3d3d3;

diff --git a/lms/static/sass/course/discussion/_askbot-original.scss b/lms/static/sass/course/discussion/_askbot-original.scss
@@ -148,7 +148,7 @@ body.user-messages {
   text-align: center;
   background-color: #f5dd69;
   border-top: #fff 1px solid;
-  font-family: 'yanone kaffeesatz',sans-serif;
+
   p.notification {
     margin-top: 6px;
     margin-bottom: 6px;
@@ -171,8 +171,7 @@ body.user-messages {
 
 #header {
   margin-top: 0px;
-  background: #16160f;
-  font-family: 'yanone kaffeesatz',sans-serif; }
+  background: #16160f; }
 
 /*.content-wrapper {
   width: 960px;