From e6465e420a62fafc27eff6f11ce8386bcb47910b Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 23 Jul 2012 11:58:01 -0400 Subject: [PATCH 1/3] Changed around the css --- lms/envs/common.py | 4 +++ lms/static/css/{ => vendor}/codemirror.css | 0 lms/static/sass/application.scss | 35 +++++-------------- lms/static/sass/base/_font_face.scss | 28 +-------------- lms/static/sass/course.scss | 23 ++++++++++++ .../sass/{ => course}/_courseware_subnav.scss | 0 .../sass/{sass_old => course/old}/.gitignore | 0 .../sass/{sass_old => course/old}/README.md | 0 .../{sass_old => course/old}/_gradebook.scss | 0 .../sass/{sass_old => course/old}/_help.scss | 0 .../sass/{sass_old => course/old}/_info.scss | 0 .../{sass_old => course/old}/_profile.scss | 0 .../{sass_old => course/old}/_textbook.scss | 0 .../{sass_old => course/old}/application.scss | 0 .../{sass_old => course/old}/base/_base.scss | 0 .../old}/base/_extends.scss | 0 .../old}/base/_font-face.scss | 0 .../old}/base/_functions.scss | 0 .../{sass_old => course/old}/base/_reset.scss | 0 .../old}/base/_variables.scss | 0 .../old}/bourbon/_bourbon.scss | 0 .../old}/bourbon/addons/_button.scss | 0 .../old}/bourbon/addons/_clearfix.scss | 0 .../old}/bourbon/addons/_font-family.scss | 0 .../bourbon/addons/_html5-input-types.scss | 0 .../old}/bourbon/addons/_position.scss | 0 .../bourbon/addons/_timing-functions.scss | 0 .../old}/bourbon/css3/_animation.scss | 0 .../old}/bourbon/css3/_appearance.scss | 0 .../old}/bourbon/css3/_background-image.scss | 0 .../old}/bourbon/css3/_background-size.scss | 0 .../old}/bourbon/css3/_border-image.scss | 0 .../old}/bourbon/css3/_border-radius.scss | 0 .../old}/bourbon/css3/_box-shadow.scss | 0 .../old}/bourbon/css3/_box-sizing.scss | 0 .../old}/bourbon/css3/_columns.scss | 0 .../old}/bourbon/css3/_flex-box.scss | 0 .../old}/bourbon/css3/_inline-block.scss | 0 .../old}/bourbon/css3/_linear-gradient.scss | 0 .../old}/bourbon/css3/_radial-gradient.scss | 0 .../old}/bourbon/css3/_transform.scss | 0 .../old}/bourbon/css3/_transition.scss | 0 .../old}/bourbon/css3/_user-select.scss | 0 .../_deprecated-webkit-gradient.scss | 0 .../old}/bourbon/functions/_flex-grid.scss | 0 .../old}/bourbon/functions/_grid-width.scss | 0 .../bourbon/functions/_linear-gradient.scss | 0 .../bourbon/functions/_modular-scale.scss | 0 .../bourbon/functions/_radial-gradient.scss | 0 .../bourbon/functions/_render-gradients.scss | 0 .../old}/bourbon/functions/_tint-shade.scss | 0 .../old}/bourbon/lib/bourbon.rb | 0 .../bourbon/lib/bourbon/sass_extensions.rb | 0 .../lib/bourbon/sass_extensions/functions.rb | 0 .../sass_extensions/functions/compact.rb | 0 .../old}/courseware/_amplifier.scss | 0 .../old}/courseware/_courseware.scss | 0 .../old}/courseware/_problems.scss | 0 .../old}/courseware/_sequence-nav.scss | 0 .../old}/courseware/_sidebar.scss | 0 .../old}/courseware/_video.scss | 0 .../old}/discussion/_answers.scss | 0 .../old}/discussion/_askbot-original.scss | 0 .../old}/discussion/_badges.scss | 0 .../old}/discussion/_discussion.scss | 0 .../old}/discussion/_form-wmd-toolbar.scss | 0 .../old}/discussion/_forms.scss | 0 .../old}/discussion/_modals.scss | 0 .../old}/discussion/_profile.scss | 0 .../old}/discussion/_question-view.scss | 0 .../old}/discussion/_questions.scss | 0 .../old}/discussion/_sidebar.scss | 0 .../old}/discussion/_tags.scss | 0 .../old}/layout/_calculator.scss | 0 .../old}/layout/_footer.scss | 0 .../old}/layout/_header.scss | 0 .../old}/layout/_layout.scss | 0 .../old}/layout/_leanmodal.scss | 0 .../old}/marketing-ie.scss | 0 .../{sass_old => course/old}/marketing.scss | 0 .../old}/marketing/_base.scss | 0 .../old}/marketing/_extends.scss | 0 .../old}/marketing/_footer.scss | 0 .../old}/marketing/_header.scss | 0 .../old}/marketing/_index.scss | 0 .../old}/marketing/_variables.scss | 0 .../plugins/_jquery-ui-1.8.16.custom.scss | 0 .../old}/plugins/_jquery.qtip.min.scss | 0 .../sass/{sass_old => course/old}/print.scss | 0 .../old}/wiki/_basic-html.scss | 0 .../old}/wiki/_create.scss | 0 .../old}/wiki/_sidebar.scss | 0 .../{sass_old => course/old}/wiki/_table.scss | 0 .../{sass_old => course/old}/wiki/_wiki.scss | 0 .../sass/{ => multicourse}/_about_pages.scss | 0 .../sass/{ => multicourse}/_course_about.scss | 0 .../sass/{ => multicourse}/_courses.scss | 0 .../sass/{ => multicourse}/_dashboard.scss | 0 .../sass/{ => multicourse}/_error-pages.scss | 0 lms/static/sass/{ => multicourse}/_home.scss | 0 lms/static/sass/{ => multicourse}/_jobs.scss | 0 .../{ => multicourse}/_password_reset.scss | 0 .../{ => multicourse}/_press_release.scss | 0 lms/templates/courseware.html | 3 +- lms/templates/main.html | 2 -- 105 files changed, 38 insertions(+), 57 deletions(-) rename lms/static/css/{ => vendor}/codemirror.css (100%) create mode 100644 lms/static/sass/course.scss rename lms/static/sass/{ => course}/_courseware_subnav.scss (100%) rename lms/static/sass/{sass_old => course/old}/.gitignore (100%) rename lms/static/sass/{sass_old => course/old}/README.md (100%) rename lms/static/sass/{sass_old => course/old}/_gradebook.scss (100%) rename lms/static/sass/{sass_old => course/old}/_help.scss (100%) rename lms/static/sass/{sass_old => course/old}/_info.scss (100%) rename lms/static/sass/{sass_old => course/old}/_profile.scss (100%) rename lms/static/sass/{sass_old => course/old}/_textbook.scss (100%) rename lms/static/sass/{sass_old => course/old}/application.scss (100%) rename lms/static/sass/{sass_old => course/old}/base/_base.scss (100%) rename lms/static/sass/{sass_old => course/old}/base/_extends.scss (100%) rename lms/static/sass/{sass_old => course/old}/base/_font-face.scss (100%) rename lms/static/sass/{sass_old => course/old}/base/_functions.scss (100%) rename lms/static/sass/{sass_old => course/old}/base/_reset.scss (100%) rename lms/static/sass/{sass_old => course/old}/base/_variables.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/_bourbon.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/addons/_button.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/addons/_clearfix.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/addons/_font-family.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/addons/_html5-input-types.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/addons/_position.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/addons/_timing-functions.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_animation.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_appearance.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_background-image.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_background-size.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_border-image.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_border-radius.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_box-shadow.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_box-sizing.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_columns.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_flex-box.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_inline-block.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_linear-gradient.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_radial-gradient.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_transform.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_transition.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/css3/_user-select.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_deprecated-webkit-gradient.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_flex-grid.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_grid-width.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_linear-gradient.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_modular-scale.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_radial-gradient.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_render-gradients.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/functions/_tint-shade.scss (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/lib/bourbon.rb (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/lib/bourbon/sass_extensions.rb (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/lib/bourbon/sass_extensions/functions.rb (100%) rename lms/static/sass/{sass_old => course/old}/bourbon/lib/bourbon/sass_extensions/functions/compact.rb (100%) rename lms/static/sass/{sass_old => course/old}/courseware/_amplifier.scss (100%) rename lms/static/sass/{sass_old => course/old}/courseware/_courseware.scss (100%) rename lms/static/sass/{sass_old => course/old}/courseware/_problems.scss (100%) rename lms/static/sass/{sass_old => course/old}/courseware/_sequence-nav.scss (100%) rename lms/static/sass/{sass_old => course/old}/courseware/_sidebar.scss (100%) rename lms/static/sass/{sass_old => course/old}/courseware/_video.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_answers.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_askbot-original.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_badges.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_discussion.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_form-wmd-toolbar.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_forms.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_modals.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_profile.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_question-view.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_questions.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_sidebar.scss (100%) rename lms/static/sass/{sass_old => course/old}/discussion/_tags.scss (100%) rename lms/static/sass/{sass_old => course/old}/layout/_calculator.scss (100%) rename lms/static/sass/{sass_old => course/old}/layout/_footer.scss (100%) rename lms/static/sass/{sass_old => course/old}/layout/_header.scss (100%) rename lms/static/sass/{sass_old => course/old}/layout/_layout.scss (100%) rename lms/static/sass/{sass_old => course/old}/layout/_leanmodal.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing-ie.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing/_base.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing/_extends.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing/_footer.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing/_header.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing/_index.scss (100%) rename lms/static/sass/{sass_old => course/old}/marketing/_variables.scss (100%) rename lms/static/sass/{sass_old => course/old}/plugins/_jquery-ui-1.8.16.custom.scss (100%) rename lms/static/sass/{sass_old => course/old}/plugins/_jquery.qtip.min.scss (100%) rename lms/static/sass/{sass_old => course/old}/print.scss (100%) rename lms/static/sass/{sass_old => course/old}/wiki/_basic-html.scss (100%) rename lms/static/sass/{sass_old => course/old}/wiki/_create.scss (100%) rename lms/static/sass/{sass_old => course/old}/wiki/_sidebar.scss (100%) rename lms/static/sass/{sass_old => course/old}/wiki/_table.scss (100%) rename lms/static/sass/{sass_old => course/old}/wiki/_wiki.scss (100%) rename lms/static/sass/{ => multicourse}/_about_pages.scss (100%) rename lms/static/sass/{ => multicourse}/_course_about.scss (100%) rename lms/static/sass/{ => multicourse}/_courses.scss (100%) rename lms/static/sass/{ => multicourse}/_dashboard.scss (100%) rename lms/static/sass/{ => multicourse}/_error-pages.scss (100%) rename lms/static/sass/{ => multicourse}/_home.scss (100%) rename lms/static/sass/{ => multicourse}/_jobs.scss (100%) rename lms/static/sass/{ => multicourse}/_password_reset.scss (100%) rename lms/static/sass/{ => multicourse}/_press_release.scss (100%) diff --git a/lms/envs/common.py b/lms/envs/common.py index 19be4b0357..f0571d19cf 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -293,6 +293,10 @@ PIPELINE_CSS = { 'source_filenames': ['sass/application.scss'], 'output_filename': 'css/application.css', }, + 'course': { + 'source_filenames': ['sass/application.scss', 'css/vendor/codemirror.css', 'css/vendor/jquery.treeview.css'], + 'output_filename': 'css/course.css', + }, 'ie-fixes': { 'source_filenames': ['sass/ie.scss'], 'output_filename': 'css/ie.css', diff --git a/lms/static/css/codemirror.css b/lms/static/css/vendor/codemirror.css similarity index 100% rename from lms/static/css/codemirror.css rename to lms/static/css/vendor/codemirror.css diff --git a/lms/static/sass/application.scss b/lms/static/sass/application.scss index 282ffb1d5f..32e57ebcb1 100644 --- a/lms/static/sass/application.scss +++ b/lms/static/sass/application.scss @@ -8,13 +8,6 @@ @import 'base/extends'; @import 'base/animations'; - -// Courseware styles -@import 'sass_old/base/variables'; -@import 'sass_old/base/extends'; -@import 'sass_old/base/functions'; - - // Multicourse styles @import 'shared/forms'; @import 'shared/footer'; @@ -24,22 +17,12 @@ @import 'shared/modal'; @import 'shared/activation_messages'; -@import 'home'; -@import 'dashboard'; -@import 'courseware_subnav'; -@import 'courses'; -@import 'course_about'; -@import 'jobs'; -@import 'about_pages'; -@import 'press_release'; -@import 'password_reset'; -@import 'error-pages'; - - -// Courseware styles -@import 'sass_old/courseware/courseware'; -@import 'sass_old/courseware/sequence-nav'; -@import 'sass_old/courseware/sidebar'; -@import 'sass_old/courseware/video'; -@import 'sass_old/courseware/amplifier'; -@import 'sass_old/courseware/problems'; +@import 'multicourse/home'; +@import 'multicourse/dashboard'; +@import 'multicourse/courses'; +@import 'multicourse/course_about'; +@import 'multicourse/jobs'; +@import 'multicourse/about_pages'; +@import 'multicourse/press_release'; +@import 'multicourse/password_reset'; +@import 'multicourse/error-pages'; diff --git a/lms/static/sass/base/_font_face.scss b/lms/static/sass/base/_font_face.scss index 56b1c1f498..c57a0a9b09 100644 --- a/lms/static/sass/base/_font_face.scss +++ b/lms/static/sass/base/_font_face.scss @@ -1,6 +1,5 @@ /* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 25, 2012 05:06:34 PM America/New_York */ - @font-face { font-family: 'Open Sans'; src: url('../fonts/OpenSans-Light-webfont.eot'); @@ -32,7 +31,7 @@ url('../fonts/OpenSans-Regular-webfont.woff') format('woff'), url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg'); - font-weight: 600; + font-weight: 400; font-style: normal; } @@ -49,31 +48,6 @@ } -// Not used in UI -// @font-face { -// font-family: 'Open Sans'; -// src: url('../fonts/OpenSans-Semibold-webfont.eot'); -// src: url('../fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), -// url('../fonts/OpenSans-Semibold-webfont.woff') format('woff'), -// url('../fonts/OpenSans-Semibold-webfont.ttf') format('truetype'), -// url('../fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg'); -// font-weight: 600; -// font-style: normal; - -// } - -// @font-face { -// font-family: 'Open Sans'; -// src: url('../fonts/OpenSans-SemiboldItalic-webfont.eot'); -// src: url('../fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'), -// url('../fonts/OpenSans-SemiboldItalic-webfont.woff') format('woff'), -// url('../fonts/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'), -// url('../fonts/OpenSans-SemiboldItalic-webfont.svg#OpenSansSemiboldItalic') format('svg'); -// font-weight: 600; -// font-style: italic; - -// } - @font-face { font-family: 'Open Sans'; src: url('../fonts/OpenSans-Bold-webfont.eot'); diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss new file mode 100644 index 0000000000..81d1e34a0e --- /dev/null +++ b/lms/static/sass/course.scss @@ -0,0 +1,23 @@ +@import 'bourbon/bourbon'; + +@import 'base/reset'; +@import 'base/font_face'; +@import 'base/variables'; +@import 'base/base'; +@import 'base/mixins'; +@import 'base/extends'; +@import 'base/animations'; + +// Course styles +@import 'course/courseware_subnav'; + +// 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/sequence-nav'; +@import 'course/old/courseware/sidebar'; +@import 'course/old/courseware/video'; +@import 'course/old/courseware/amplifier'; +@import 'course/old/courseware/problems'; diff --git a/lms/static/sass/_courseware_subnav.scss b/lms/static/sass/course/_courseware_subnav.scss similarity index 100% rename from lms/static/sass/_courseware_subnav.scss rename to lms/static/sass/course/_courseware_subnav.scss diff --git a/lms/static/sass/sass_old/.gitignore b/lms/static/sass/course/old/.gitignore similarity index 100% rename from lms/static/sass/sass_old/.gitignore rename to lms/static/sass/course/old/.gitignore diff --git a/lms/static/sass/sass_old/README.md b/lms/static/sass/course/old/README.md similarity index 100% rename from lms/static/sass/sass_old/README.md rename to lms/static/sass/course/old/README.md diff --git a/lms/static/sass/sass_old/_gradebook.scss b/lms/static/sass/course/old/_gradebook.scss similarity index 100% rename from lms/static/sass/sass_old/_gradebook.scss rename to lms/static/sass/course/old/_gradebook.scss diff --git a/lms/static/sass/sass_old/_help.scss b/lms/static/sass/course/old/_help.scss similarity index 100% rename from lms/static/sass/sass_old/_help.scss rename to lms/static/sass/course/old/_help.scss diff --git a/lms/static/sass/sass_old/_info.scss b/lms/static/sass/course/old/_info.scss similarity index 100% rename from lms/static/sass/sass_old/_info.scss rename to lms/static/sass/course/old/_info.scss diff --git a/lms/static/sass/sass_old/_profile.scss b/lms/static/sass/course/old/_profile.scss similarity index 100% rename from lms/static/sass/sass_old/_profile.scss rename to lms/static/sass/course/old/_profile.scss diff --git a/lms/static/sass/sass_old/_textbook.scss b/lms/static/sass/course/old/_textbook.scss similarity index 100% rename from lms/static/sass/sass_old/_textbook.scss rename to lms/static/sass/course/old/_textbook.scss diff --git a/lms/static/sass/sass_old/application.scss b/lms/static/sass/course/old/application.scss similarity index 100% rename from lms/static/sass/sass_old/application.scss rename to lms/static/sass/course/old/application.scss diff --git a/lms/static/sass/sass_old/base/_base.scss b/lms/static/sass/course/old/base/_base.scss similarity index 100% rename from lms/static/sass/sass_old/base/_base.scss rename to lms/static/sass/course/old/base/_base.scss diff --git a/lms/static/sass/sass_old/base/_extends.scss b/lms/static/sass/course/old/base/_extends.scss similarity index 100% rename from lms/static/sass/sass_old/base/_extends.scss rename to lms/static/sass/course/old/base/_extends.scss diff --git a/lms/static/sass/sass_old/base/_font-face.scss b/lms/static/sass/course/old/base/_font-face.scss similarity index 100% rename from lms/static/sass/sass_old/base/_font-face.scss rename to lms/static/sass/course/old/base/_font-face.scss diff --git a/lms/static/sass/sass_old/base/_functions.scss b/lms/static/sass/course/old/base/_functions.scss similarity index 100% rename from lms/static/sass/sass_old/base/_functions.scss rename to lms/static/sass/course/old/base/_functions.scss diff --git a/lms/static/sass/sass_old/base/_reset.scss b/lms/static/sass/course/old/base/_reset.scss similarity index 100% rename from lms/static/sass/sass_old/base/_reset.scss rename to lms/static/sass/course/old/base/_reset.scss diff --git a/lms/static/sass/sass_old/base/_variables.scss b/lms/static/sass/course/old/base/_variables.scss similarity index 100% rename from lms/static/sass/sass_old/base/_variables.scss rename to lms/static/sass/course/old/base/_variables.scss diff --git a/lms/static/sass/sass_old/bourbon/_bourbon.scss b/lms/static/sass/course/old/bourbon/_bourbon.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/_bourbon.scss rename to lms/static/sass/course/old/bourbon/_bourbon.scss diff --git a/lms/static/sass/sass_old/bourbon/addons/_button.scss b/lms/static/sass/course/old/bourbon/addons/_button.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/addons/_button.scss rename to lms/static/sass/course/old/bourbon/addons/_button.scss diff --git a/lms/static/sass/sass_old/bourbon/addons/_clearfix.scss b/lms/static/sass/course/old/bourbon/addons/_clearfix.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/addons/_clearfix.scss rename to lms/static/sass/course/old/bourbon/addons/_clearfix.scss diff --git a/lms/static/sass/sass_old/bourbon/addons/_font-family.scss b/lms/static/sass/course/old/bourbon/addons/_font-family.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/addons/_font-family.scss rename to lms/static/sass/course/old/bourbon/addons/_font-family.scss diff --git a/lms/static/sass/sass_old/bourbon/addons/_html5-input-types.scss b/lms/static/sass/course/old/bourbon/addons/_html5-input-types.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/addons/_html5-input-types.scss rename to lms/static/sass/course/old/bourbon/addons/_html5-input-types.scss diff --git a/lms/static/sass/sass_old/bourbon/addons/_position.scss b/lms/static/sass/course/old/bourbon/addons/_position.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/addons/_position.scss rename to lms/static/sass/course/old/bourbon/addons/_position.scss diff --git a/lms/static/sass/sass_old/bourbon/addons/_timing-functions.scss b/lms/static/sass/course/old/bourbon/addons/_timing-functions.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/addons/_timing-functions.scss rename to lms/static/sass/course/old/bourbon/addons/_timing-functions.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_animation.scss b/lms/static/sass/course/old/bourbon/css3/_animation.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_animation.scss rename to lms/static/sass/course/old/bourbon/css3/_animation.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_appearance.scss b/lms/static/sass/course/old/bourbon/css3/_appearance.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_appearance.scss rename to lms/static/sass/course/old/bourbon/css3/_appearance.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_background-image.scss b/lms/static/sass/course/old/bourbon/css3/_background-image.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_background-image.scss rename to lms/static/sass/course/old/bourbon/css3/_background-image.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_background-size.scss b/lms/static/sass/course/old/bourbon/css3/_background-size.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_background-size.scss rename to lms/static/sass/course/old/bourbon/css3/_background-size.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_border-image.scss b/lms/static/sass/course/old/bourbon/css3/_border-image.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_border-image.scss rename to lms/static/sass/course/old/bourbon/css3/_border-image.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_border-radius.scss b/lms/static/sass/course/old/bourbon/css3/_border-radius.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_border-radius.scss rename to lms/static/sass/course/old/bourbon/css3/_border-radius.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_box-shadow.scss b/lms/static/sass/course/old/bourbon/css3/_box-shadow.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_box-shadow.scss rename to lms/static/sass/course/old/bourbon/css3/_box-shadow.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_box-sizing.scss b/lms/static/sass/course/old/bourbon/css3/_box-sizing.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_box-sizing.scss rename to lms/static/sass/course/old/bourbon/css3/_box-sizing.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_columns.scss b/lms/static/sass/course/old/bourbon/css3/_columns.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_columns.scss rename to lms/static/sass/course/old/bourbon/css3/_columns.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_flex-box.scss b/lms/static/sass/course/old/bourbon/css3/_flex-box.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_flex-box.scss rename to lms/static/sass/course/old/bourbon/css3/_flex-box.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_inline-block.scss b/lms/static/sass/course/old/bourbon/css3/_inline-block.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_inline-block.scss rename to lms/static/sass/course/old/bourbon/css3/_inline-block.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_linear-gradient.scss b/lms/static/sass/course/old/bourbon/css3/_linear-gradient.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_linear-gradient.scss rename to lms/static/sass/course/old/bourbon/css3/_linear-gradient.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_radial-gradient.scss b/lms/static/sass/course/old/bourbon/css3/_radial-gradient.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_radial-gradient.scss rename to lms/static/sass/course/old/bourbon/css3/_radial-gradient.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_transform.scss b/lms/static/sass/course/old/bourbon/css3/_transform.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_transform.scss rename to lms/static/sass/course/old/bourbon/css3/_transform.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_transition.scss b/lms/static/sass/course/old/bourbon/css3/_transition.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_transition.scss rename to lms/static/sass/course/old/bourbon/css3/_transition.scss diff --git a/lms/static/sass/sass_old/bourbon/css3/_user-select.scss b/lms/static/sass/course/old/bourbon/css3/_user-select.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/css3/_user-select.scss rename to lms/static/sass/course/old/bourbon/css3/_user-select.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_deprecated-webkit-gradient.scss b/lms/static/sass/course/old/bourbon/functions/_deprecated-webkit-gradient.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_deprecated-webkit-gradient.scss rename to lms/static/sass/course/old/bourbon/functions/_deprecated-webkit-gradient.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_flex-grid.scss b/lms/static/sass/course/old/bourbon/functions/_flex-grid.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_flex-grid.scss rename to lms/static/sass/course/old/bourbon/functions/_flex-grid.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_grid-width.scss b/lms/static/sass/course/old/bourbon/functions/_grid-width.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_grid-width.scss rename to lms/static/sass/course/old/bourbon/functions/_grid-width.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_linear-gradient.scss b/lms/static/sass/course/old/bourbon/functions/_linear-gradient.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_linear-gradient.scss rename to lms/static/sass/course/old/bourbon/functions/_linear-gradient.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_modular-scale.scss b/lms/static/sass/course/old/bourbon/functions/_modular-scale.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_modular-scale.scss rename to lms/static/sass/course/old/bourbon/functions/_modular-scale.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_radial-gradient.scss b/lms/static/sass/course/old/bourbon/functions/_radial-gradient.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_radial-gradient.scss rename to lms/static/sass/course/old/bourbon/functions/_radial-gradient.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_render-gradients.scss b/lms/static/sass/course/old/bourbon/functions/_render-gradients.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_render-gradients.scss rename to lms/static/sass/course/old/bourbon/functions/_render-gradients.scss diff --git a/lms/static/sass/sass_old/bourbon/functions/_tint-shade.scss b/lms/static/sass/course/old/bourbon/functions/_tint-shade.scss similarity index 100% rename from lms/static/sass/sass_old/bourbon/functions/_tint-shade.scss rename to lms/static/sass/course/old/bourbon/functions/_tint-shade.scss diff --git a/lms/static/sass/sass_old/bourbon/lib/bourbon.rb b/lms/static/sass/course/old/bourbon/lib/bourbon.rb similarity index 100% rename from lms/static/sass/sass_old/bourbon/lib/bourbon.rb rename to lms/static/sass/course/old/bourbon/lib/bourbon.rb diff --git a/lms/static/sass/sass_old/bourbon/lib/bourbon/sass_extensions.rb b/lms/static/sass/course/old/bourbon/lib/bourbon/sass_extensions.rb similarity index 100% rename from lms/static/sass/sass_old/bourbon/lib/bourbon/sass_extensions.rb rename to lms/static/sass/course/old/bourbon/lib/bourbon/sass_extensions.rb diff --git a/lms/static/sass/sass_old/bourbon/lib/bourbon/sass_extensions/functions.rb b/lms/static/sass/course/old/bourbon/lib/bourbon/sass_extensions/functions.rb similarity index 100% rename from lms/static/sass/sass_old/bourbon/lib/bourbon/sass_extensions/functions.rb rename to lms/static/sass/course/old/bourbon/lib/bourbon/sass_extensions/functions.rb diff --git a/lms/static/sass/sass_old/bourbon/lib/bourbon/sass_extensions/functions/compact.rb b/lms/static/sass/course/old/bourbon/lib/bourbon/sass_extensions/functions/compact.rb similarity index 100% rename from lms/static/sass/sass_old/bourbon/lib/bourbon/sass_extensions/functions/compact.rb rename to lms/static/sass/course/old/bourbon/lib/bourbon/sass_extensions/functions/compact.rb diff --git a/lms/static/sass/sass_old/courseware/_amplifier.scss b/lms/static/sass/course/old/courseware/_amplifier.scss similarity index 100% rename from lms/static/sass/sass_old/courseware/_amplifier.scss rename to lms/static/sass/course/old/courseware/_amplifier.scss diff --git a/lms/static/sass/sass_old/courseware/_courseware.scss b/lms/static/sass/course/old/courseware/_courseware.scss similarity index 100% rename from lms/static/sass/sass_old/courseware/_courseware.scss rename to lms/static/sass/course/old/courseware/_courseware.scss diff --git a/lms/static/sass/sass_old/courseware/_problems.scss b/lms/static/sass/course/old/courseware/_problems.scss similarity index 100% rename from lms/static/sass/sass_old/courseware/_problems.scss rename to lms/static/sass/course/old/courseware/_problems.scss diff --git a/lms/static/sass/sass_old/courseware/_sequence-nav.scss b/lms/static/sass/course/old/courseware/_sequence-nav.scss similarity index 100% rename from lms/static/sass/sass_old/courseware/_sequence-nav.scss rename to lms/static/sass/course/old/courseware/_sequence-nav.scss diff --git a/lms/static/sass/sass_old/courseware/_sidebar.scss b/lms/static/sass/course/old/courseware/_sidebar.scss similarity index 100% rename from lms/static/sass/sass_old/courseware/_sidebar.scss rename to lms/static/sass/course/old/courseware/_sidebar.scss diff --git a/lms/static/sass/sass_old/courseware/_video.scss b/lms/static/sass/course/old/courseware/_video.scss similarity index 100% rename from lms/static/sass/sass_old/courseware/_video.scss rename to lms/static/sass/course/old/courseware/_video.scss diff --git a/lms/static/sass/sass_old/discussion/_answers.scss b/lms/static/sass/course/old/discussion/_answers.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_answers.scss rename to lms/static/sass/course/old/discussion/_answers.scss diff --git a/lms/static/sass/sass_old/discussion/_askbot-original.scss b/lms/static/sass/course/old/discussion/_askbot-original.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_askbot-original.scss rename to lms/static/sass/course/old/discussion/_askbot-original.scss diff --git a/lms/static/sass/sass_old/discussion/_badges.scss b/lms/static/sass/course/old/discussion/_badges.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_badges.scss rename to lms/static/sass/course/old/discussion/_badges.scss diff --git a/lms/static/sass/sass_old/discussion/_discussion.scss b/lms/static/sass/course/old/discussion/_discussion.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_discussion.scss rename to lms/static/sass/course/old/discussion/_discussion.scss diff --git a/lms/static/sass/sass_old/discussion/_form-wmd-toolbar.scss b/lms/static/sass/course/old/discussion/_form-wmd-toolbar.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_form-wmd-toolbar.scss rename to lms/static/sass/course/old/discussion/_form-wmd-toolbar.scss diff --git a/lms/static/sass/sass_old/discussion/_forms.scss b/lms/static/sass/course/old/discussion/_forms.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_forms.scss rename to lms/static/sass/course/old/discussion/_forms.scss diff --git a/lms/static/sass/sass_old/discussion/_modals.scss b/lms/static/sass/course/old/discussion/_modals.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_modals.scss rename to lms/static/sass/course/old/discussion/_modals.scss diff --git a/lms/static/sass/sass_old/discussion/_profile.scss b/lms/static/sass/course/old/discussion/_profile.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_profile.scss rename to lms/static/sass/course/old/discussion/_profile.scss diff --git a/lms/static/sass/sass_old/discussion/_question-view.scss b/lms/static/sass/course/old/discussion/_question-view.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_question-view.scss rename to lms/static/sass/course/old/discussion/_question-view.scss diff --git a/lms/static/sass/sass_old/discussion/_questions.scss b/lms/static/sass/course/old/discussion/_questions.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_questions.scss rename to lms/static/sass/course/old/discussion/_questions.scss diff --git a/lms/static/sass/sass_old/discussion/_sidebar.scss b/lms/static/sass/course/old/discussion/_sidebar.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_sidebar.scss rename to lms/static/sass/course/old/discussion/_sidebar.scss diff --git a/lms/static/sass/sass_old/discussion/_tags.scss b/lms/static/sass/course/old/discussion/_tags.scss similarity index 100% rename from lms/static/sass/sass_old/discussion/_tags.scss rename to lms/static/sass/course/old/discussion/_tags.scss diff --git a/lms/static/sass/sass_old/layout/_calculator.scss b/lms/static/sass/course/old/layout/_calculator.scss similarity index 100% rename from lms/static/sass/sass_old/layout/_calculator.scss rename to lms/static/sass/course/old/layout/_calculator.scss diff --git a/lms/static/sass/sass_old/layout/_footer.scss b/lms/static/sass/course/old/layout/_footer.scss similarity index 100% rename from lms/static/sass/sass_old/layout/_footer.scss rename to lms/static/sass/course/old/layout/_footer.scss diff --git a/lms/static/sass/sass_old/layout/_header.scss b/lms/static/sass/course/old/layout/_header.scss similarity index 100% rename from lms/static/sass/sass_old/layout/_header.scss rename to lms/static/sass/course/old/layout/_header.scss diff --git a/lms/static/sass/sass_old/layout/_layout.scss b/lms/static/sass/course/old/layout/_layout.scss similarity index 100% rename from lms/static/sass/sass_old/layout/_layout.scss rename to lms/static/sass/course/old/layout/_layout.scss diff --git a/lms/static/sass/sass_old/layout/_leanmodal.scss b/lms/static/sass/course/old/layout/_leanmodal.scss similarity index 100% rename from lms/static/sass/sass_old/layout/_leanmodal.scss rename to lms/static/sass/course/old/layout/_leanmodal.scss diff --git a/lms/static/sass/sass_old/marketing-ie.scss b/lms/static/sass/course/old/marketing-ie.scss similarity index 100% rename from lms/static/sass/sass_old/marketing-ie.scss rename to lms/static/sass/course/old/marketing-ie.scss diff --git a/lms/static/sass/sass_old/marketing.scss b/lms/static/sass/course/old/marketing.scss similarity index 100% rename from lms/static/sass/sass_old/marketing.scss rename to lms/static/sass/course/old/marketing.scss diff --git a/lms/static/sass/sass_old/marketing/_base.scss b/lms/static/sass/course/old/marketing/_base.scss similarity index 100% rename from lms/static/sass/sass_old/marketing/_base.scss rename to lms/static/sass/course/old/marketing/_base.scss diff --git a/lms/static/sass/sass_old/marketing/_extends.scss b/lms/static/sass/course/old/marketing/_extends.scss similarity index 100% rename from lms/static/sass/sass_old/marketing/_extends.scss rename to lms/static/sass/course/old/marketing/_extends.scss diff --git a/lms/static/sass/sass_old/marketing/_footer.scss b/lms/static/sass/course/old/marketing/_footer.scss similarity index 100% rename from lms/static/sass/sass_old/marketing/_footer.scss rename to lms/static/sass/course/old/marketing/_footer.scss diff --git a/lms/static/sass/sass_old/marketing/_header.scss b/lms/static/sass/course/old/marketing/_header.scss similarity index 100% rename from lms/static/sass/sass_old/marketing/_header.scss rename to lms/static/sass/course/old/marketing/_header.scss diff --git a/lms/static/sass/sass_old/marketing/_index.scss b/lms/static/sass/course/old/marketing/_index.scss similarity index 100% rename from lms/static/sass/sass_old/marketing/_index.scss rename to lms/static/sass/course/old/marketing/_index.scss diff --git a/lms/static/sass/sass_old/marketing/_variables.scss b/lms/static/sass/course/old/marketing/_variables.scss similarity index 100% rename from lms/static/sass/sass_old/marketing/_variables.scss rename to lms/static/sass/course/old/marketing/_variables.scss diff --git a/lms/static/sass/sass_old/plugins/_jquery-ui-1.8.16.custom.scss b/lms/static/sass/course/old/plugins/_jquery-ui-1.8.16.custom.scss similarity index 100% rename from lms/static/sass/sass_old/plugins/_jquery-ui-1.8.16.custom.scss rename to lms/static/sass/course/old/plugins/_jquery-ui-1.8.16.custom.scss diff --git a/lms/static/sass/sass_old/plugins/_jquery.qtip.min.scss b/lms/static/sass/course/old/plugins/_jquery.qtip.min.scss similarity index 100% rename from lms/static/sass/sass_old/plugins/_jquery.qtip.min.scss rename to lms/static/sass/course/old/plugins/_jquery.qtip.min.scss diff --git a/lms/static/sass/sass_old/print.scss b/lms/static/sass/course/old/print.scss similarity index 100% rename from lms/static/sass/sass_old/print.scss rename to lms/static/sass/course/old/print.scss diff --git a/lms/static/sass/sass_old/wiki/_basic-html.scss b/lms/static/sass/course/old/wiki/_basic-html.scss similarity index 100% rename from lms/static/sass/sass_old/wiki/_basic-html.scss rename to lms/static/sass/course/old/wiki/_basic-html.scss diff --git a/lms/static/sass/sass_old/wiki/_create.scss b/lms/static/sass/course/old/wiki/_create.scss similarity index 100% rename from lms/static/sass/sass_old/wiki/_create.scss rename to lms/static/sass/course/old/wiki/_create.scss diff --git a/lms/static/sass/sass_old/wiki/_sidebar.scss b/lms/static/sass/course/old/wiki/_sidebar.scss similarity index 100% rename from lms/static/sass/sass_old/wiki/_sidebar.scss rename to lms/static/sass/course/old/wiki/_sidebar.scss diff --git a/lms/static/sass/sass_old/wiki/_table.scss b/lms/static/sass/course/old/wiki/_table.scss similarity index 100% rename from lms/static/sass/sass_old/wiki/_table.scss rename to lms/static/sass/course/old/wiki/_table.scss diff --git a/lms/static/sass/sass_old/wiki/_wiki.scss b/lms/static/sass/course/old/wiki/_wiki.scss similarity index 100% rename from lms/static/sass/sass_old/wiki/_wiki.scss rename to lms/static/sass/course/old/wiki/_wiki.scss diff --git a/lms/static/sass/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss similarity index 100% rename from lms/static/sass/_about_pages.scss rename to lms/static/sass/multicourse/_about_pages.scss diff --git a/lms/static/sass/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss similarity index 100% rename from lms/static/sass/_course_about.scss rename to lms/static/sass/multicourse/_course_about.scss diff --git a/lms/static/sass/_courses.scss b/lms/static/sass/multicourse/_courses.scss similarity index 100% rename from lms/static/sass/_courses.scss rename to lms/static/sass/multicourse/_courses.scss diff --git a/lms/static/sass/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss similarity index 100% rename from lms/static/sass/_dashboard.scss rename to lms/static/sass/multicourse/_dashboard.scss diff --git a/lms/static/sass/_error-pages.scss b/lms/static/sass/multicourse/_error-pages.scss similarity index 100% rename from lms/static/sass/_error-pages.scss rename to lms/static/sass/multicourse/_error-pages.scss diff --git a/lms/static/sass/_home.scss b/lms/static/sass/multicourse/_home.scss similarity index 100% rename from lms/static/sass/_home.scss rename to lms/static/sass/multicourse/_home.scss diff --git a/lms/static/sass/_jobs.scss b/lms/static/sass/multicourse/_jobs.scss similarity index 100% rename from lms/static/sass/_jobs.scss rename to lms/static/sass/multicourse/_jobs.scss diff --git a/lms/static/sass/_password_reset.scss b/lms/static/sass/multicourse/_password_reset.scss similarity index 100% rename from lms/static/sass/_password_reset.scss rename to lms/static/sass/multicourse/_password_reset.scss diff --git a/lms/static/sass/_press_release.scss b/lms/static/sass/multicourse/_press_release.scss similarity index 100% rename from lms/static/sass/_press_release.scss rename to lms/static/sass/multicourse/_press_release.scss diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html index f6133860f4..464760f8da 100644 --- a/lms/templates/courseware.html +++ b/lms/templates/courseware.html @@ -5,10 +5,8 @@ <%block name="js_extra"> - ## codemirror - ## alternate codemirror @@ -25,6 +23,7 @@ <%static:js group='courseware'/> + <%static:css group='course'/> <%include file="mathjax_include.html" /> diff --git a/lms/templates/main.html b/lms/templates/main.html index 15639a1c28..50e778e280 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -5,8 +5,6 @@ <%block name="title">edX - - <%static:css group='application'/>