diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 9cbc4ed048..a9d4bf3b4f 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -10,6 +10,7 @@ $dark-blue: #50545c; $bright-blue: #3c8ebf; $orange: #f96e5b; $yellow: #fff8af; +$cream: #F6EFD4; // Base html styles html { diff --git a/lms/static/sass/course/old/courseware/_sequence-nav.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss similarity index 78% rename from lms/static/sass/course/old/courseware/_sequence-nav.scss rename to common/lib/xmodule/xmodule/css/sequence/display.scss index a77403d11f..d2ea986a4c 100644 --- a/lms/static/sass/course/old/courseware/_sequence-nav.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -1,5 +1,8 @@ nav.sequence-nav { + // TODO (cpennington): This doesn't work anymore. XModules aren't able to + // import from external sources. @extend .topbar; + border-bottom: 1px solid darken($cream, 20%); margin-bottom: $body-line-height; position: relative; @@ -260,86 +263,73 @@ nav.sequence-nav { } } +div.seq_contents { + display: none; +} -section.course-content { - position: relative; +nav.sequence-bottom { + margin: lh(2) 0 0; + text-align: center; - ol.vert-mod { - nav.sequence-nav { - margin-top: -15px; - @include border-radius(0); - } - } + ul { + @extend .clearfix; + background-color: darken(#F6EFD4, 5%); + background-color: darken($cream, 5%); + border: 1px solid darken(#f6efd4, 20%); + @include border-radius(3px); + @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); + @include inline-block(); - div.seq_contents { - display: none; - } + li { + float: left; - nav.sequence-bottom { - margin: lh(2) 0 0; - text-align: center; + &.prev, &.next { + margin-bottom: 0; - ul { - @extend .clearfix; - background-color: darken(#F6EFD4, 5%); - background-color: darken($cream, 5%); - border: 1px solid darken(#f6efd4, 20%); - @include border-radius(3px); - @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); - @include inline-block(); + a { + background-position: center center; + background-repeat: no-repeat; + border-bottom: none; + display: block; + padding: lh(.5) 4px; + text-indent: -9999px; + @include transition(all, .2s, $ease-in-out-quad); + width: 45px; - li { - float: left; + &:hover { + background-color: $cream; + color: darken($cream, 60%); + opacity: .5; + text-decoration: none; + } - &.prev, &.next { - margin-bottom: 0; - - a { - background-position: center center; - background-repeat: no-repeat; - border-bottom: none; - display: block; - padding: lh(.5) 4px; - text-indent: -9999px; - @include transition(all, .2s, $ease-in-out-quad); - width: 45px; - - &:hover { - background-color: $cream; - color: darken($cream, 60%); - opacity: .5; - text-decoration: none; - } - - &.disabled { - background-color: lighten($cream, 10%); - opacity: .4; - } + &.disabled { + background-color: lighten($cream, 10%); + opacity: .4; } } + } - &.prev { - a { - background-image: url('../images/sequence-nav/previous-icon.png'); - border-right: 1px solid darken(#f6efd4, 20%); + &.prev { + a { + background-image: url('../images/sequence-nav/previous-icon.png'); + border-right: 1px solid darken(#f6efd4, 20%); - &:hover { - background-color: none; - } + &:hover { + background-color: none; } } + } - &.next { - a { - background-image: url('../images/sequence-nav/next-icon.png'); + &.next { + a { + background-image: url('../images/sequence-nav/next-icon.png'); - &:hover { - background-color: none; - } + &:hover { + background-color: none; } } } } } } - diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py index 49c074852d..b39292c2ca 100644 --- a/common/lib/xmodule/xmodule/seq_module.py +++ b/common/lib/xmodule/xmodule/seq_module.py @@ -21,6 +21,7 @@ class SequenceModule(XModule): ''' Layout module which lays out content in a temporal sequence ''' js = {'coffee': [resource_string(__name__, 'js/src/sequence/display.coffee')]} + css = {'scss': [resource_string(__name__, 'css/sequence/display.scss')]} js_module_name = "Sequence" def __init__(self, system, location, definition, instance_state=None, shared_state=None, **kwargs): diff --git a/lms/static/images/sequence-nav/document-icon-current.png b/common/static/images/sequence-nav/document-icon-current.png similarity index 100% rename from lms/static/images/sequence-nav/document-icon-current.png rename to common/static/images/sequence-nav/document-icon-current.png diff --git a/lms/static/images/sequence-nav/document-icon-normal.png b/common/static/images/sequence-nav/document-icon-normal.png similarity index 100% rename from lms/static/images/sequence-nav/document-icon-normal.png rename to common/static/images/sequence-nav/document-icon-normal.png diff --git a/lms/static/images/sequence-nav/document-icon-visited.png b/common/static/images/sequence-nav/document-icon-visited.png similarity index 100% rename from lms/static/images/sequence-nav/document-icon-visited.png rename to common/static/images/sequence-nav/document-icon-visited.png diff --git a/lms/static/images/sequence-nav/edit.png b/common/static/images/sequence-nav/edit.png similarity index 100% rename from lms/static/images/sequence-nav/edit.png rename to common/static/images/sequence-nav/edit.png diff --git a/lms/static/images/sequence-nav/history.png b/common/static/images/sequence-nav/history.png similarity index 100% rename from lms/static/images/sequence-nav/history.png rename to common/static/images/sequence-nav/history.png diff --git a/lms/static/images/sequence-nav/list-icon-current.png b/common/static/images/sequence-nav/list-icon-current.png similarity index 100% rename from lms/static/images/sequence-nav/list-icon-current.png rename to common/static/images/sequence-nav/list-icon-current.png diff --git a/lms/static/images/sequence-nav/list-icon-normal.png b/common/static/images/sequence-nav/list-icon-normal.png similarity index 100% rename from lms/static/images/sequence-nav/list-icon-normal.png rename to common/static/images/sequence-nav/list-icon-normal.png diff --git a/lms/static/images/sequence-nav/list-icon-visited.png b/common/static/images/sequence-nav/list-icon-visited.png similarity index 100% rename from lms/static/images/sequence-nav/list-icon-visited.png rename to common/static/images/sequence-nav/list-icon-visited.png diff --git a/lms/static/images/sequence-nav/next-icon.png b/common/static/images/sequence-nav/next-icon.png similarity index 100% rename from lms/static/images/sequence-nav/next-icon.png rename to common/static/images/sequence-nav/next-icon.png diff --git a/lms/static/images/sequence-nav/other-icon.png b/common/static/images/sequence-nav/other-icon.png similarity index 100% rename from lms/static/images/sequence-nav/other-icon.png rename to common/static/images/sequence-nav/other-icon.png diff --git a/lms/static/images/sequence-nav/previous-icon.png b/common/static/images/sequence-nav/previous-icon.png similarity index 100% rename from lms/static/images/sequence-nav/previous-icon.png rename to common/static/images/sequence-nav/previous-icon.png diff --git a/lms/static/images/sequence-nav/problem-icon-alt.png b/common/static/images/sequence-nav/problem-icon-alt.png similarity index 100% rename from lms/static/images/sequence-nav/problem-icon-alt.png rename to common/static/images/sequence-nav/problem-icon-alt.png diff --git a/lms/static/images/sequence-nav/status/check.png b/common/static/images/sequence-nav/status/check.png similarity index 100% rename from lms/static/images/sequence-nav/status/check.png rename to common/static/images/sequence-nav/status/check.png diff --git a/lms/static/images/sequence-nav/status/dash.png b/common/static/images/sequence-nav/status/dash.png similarity index 100% rename from lms/static/images/sequence-nav/status/dash.png rename to common/static/images/sequence-nav/status/dash.png diff --git a/lms/static/images/sequence-nav/status/not-started.png b/common/static/images/sequence-nav/status/not-started.png similarity index 100% rename from lms/static/images/sequence-nav/status/not-started.png rename to common/static/images/sequence-nav/status/not-started.png diff --git a/lms/static/images/sequence-nav/status/wrong.png b/common/static/images/sequence-nav/status/wrong.png similarity index 100% rename from lms/static/images/sequence-nav/status/wrong.png rename to common/static/images/sequence-nav/status/wrong.png diff --git a/lms/static/images/sequence-nav/vertical-icon.png b/common/static/images/sequence-nav/vertical-icon.png similarity index 100% rename from lms/static/images/sequence-nav/vertical-icon.png rename to common/static/images/sequence-nav/vertical-icon.png diff --git a/lms/static/images/sequence-nav/video-icon-current.png b/common/static/images/sequence-nav/video-icon-current.png similarity index 100% rename from lms/static/images/sequence-nav/video-icon-current.png rename to common/static/images/sequence-nav/video-icon-current.png diff --git a/lms/static/images/sequence-nav/video-icon-normal.png b/common/static/images/sequence-nav/video-icon-normal.png similarity index 100% rename from lms/static/images/sequence-nav/video-icon-normal.png rename to common/static/images/sequence-nav/video-icon-normal.png diff --git a/lms/static/images/sequence-nav/video-icon-visited.png b/common/static/images/sequence-nav/video-icon-visited.png similarity index 100% rename from lms/static/images/sequence-nav/video-icon-visited.png rename to common/static/images/sequence-nav/video-icon-visited.png diff --git a/lms/static/images/sequence-nav/video-icon.png b/common/static/images/sequence-nav/video-icon.png similarity index 100% rename from lms/static/images/sequence-nav/video-icon.png rename to common/static/images/sequence-nav/video-icon.png diff --git a/lms/static/images/sequence-nav/view.png b/common/static/images/sequence-nav/view.png similarity index 100% rename from lms/static/images/sequence-nav/view.png rename to common/static/images/sequence-nav/view.png diff --git a/lms/static/images_old/sequence-nav/document-icon-current.png b/lms/static/images_old/sequence-nav/document-icon-current.png deleted file mode 100644 index 52f9185e93..0000000000 Binary files a/lms/static/images_old/sequence-nav/document-icon-current.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/document-icon-normal.png b/lms/static/images_old/sequence-nav/document-icon-normal.png deleted file mode 100644 index 6e76ad0d93..0000000000 Binary files a/lms/static/images_old/sequence-nav/document-icon-normal.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/document-icon-visited.png b/lms/static/images_old/sequence-nav/document-icon-visited.png deleted file mode 100644 index 5fe36cbbee..0000000000 Binary files a/lms/static/images_old/sequence-nav/document-icon-visited.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/edit.png b/lms/static/images_old/sequence-nav/edit.png deleted file mode 100644 index 9ad3945c35..0000000000 Binary files a/lms/static/images_old/sequence-nav/edit.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/history.png b/lms/static/images_old/sequence-nav/history.png deleted file mode 100644 index fa8a2d8177..0000000000 Binary files a/lms/static/images_old/sequence-nav/history.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/list-icon-current.png b/lms/static/images_old/sequence-nav/list-icon-current.png deleted file mode 100644 index d8ad94d53e..0000000000 Binary files a/lms/static/images_old/sequence-nav/list-icon-current.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/list-icon-normal.png b/lms/static/images_old/sequence-nav/list-icon-normal.png deleted file mode 100644 index 42c473e82b..0000000000 Binary files a/lms/static/images_old/sequence-nav/list-icon-normal.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/list-icon-visited.png b/lms/static/images_old/sequence-nav/list-icon-visited.png deleted file mode 100644 index 2df2935dbe..0000000000 Binary files a/lms/static/images_old/sequence-nav/list-icon-visited.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/next-icon.png b/lms/static/images_old/sequence-nav/next-icon.png deleted file mode 100644 index 413ce38d1b..0000000000 Binary files a/lms/static/images_old/sequence-nav/next-icon.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/other-icon.png b/lms/static/images_old/sequence-nav/other-icon.png deleted file mode 100644 index 822a415972..0000000000 Binary files a/lms/static/images_old/sequence-nav/other-icon.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/previous-icon.png b/lms/static/images_old/sequence-nav/previous-icon.png deleted file mode 100644 index 0b3f369176..0000000000 Binary files a/lms/static/images_old/sequence-nav/previous-icon.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/problem-icon-alt.png b/lms/static/images_old/sequence-nav/problem-icon-alt.png deleted file mode 100644 index c276ba223f..0000000000 Binary files a/lms/static/images_old/sequence-nav/problem-icon-alt.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/vertical-icon.png b/lms/static/images_old/sequence-nav/vertical-icon.png deleted file mode 100644 index 6100b678c4..0000000000 Binary files a/lms/static/images_old/sequence-nav/vertical-icon.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/video-icon-current.png b/lms/static/images_old/sequence-nav/video-icon-current.png deleted file mode 100644 index 8bbc910f61..0000000000 Binary files a/lms/static/images_old/sequence-nav/video-icon-current.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/video-icon-normal.png b/lms/static/images_old/sequence-nav/video-icon-normal.png deleted file mode 100644 index 52321ebf7b..0000000000 Binary files a/lms/static/images_old/sequence-nav/video-icon-normal.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/video-icon-visited.png b/lms/static/images_old/sequence-nav/video-icon-visited.png deleted file mode 100644 index e09aad8d20..0000000000 Binary files a/lms/static/images_old/sequence-nav/video-icon-visited.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/video-icon.png b/lms/static/images_old/sequence-nav/video-icon.png deleted file mode 100644 index e68ec0f8ae..0000000000 Binary files a/lms/static/images_old/sequence-nav/video-icon.png and /dev/null differ diff --git a/lms/static/images_old/sequence-nav/view.png b/lms/static/images_old/sequence-nav/view.png deleted file mode 100644 index 62f04aa993..0000000000 Binary files a/lms/static/images_old/sequence-nav/view.png and /dev/null differ diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss index 0f78da572f..5c3039ad9a 100644 --- a/lms/static/sass/course.scss +++ b/lms/static/sass/course.scss @@ -16,7 +16,6 @@ @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';