From d30ae5389ee47d78a202d4cc9363f316e4f1e6d4 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 31 Jul 2012 14:18:42 -0400 Subject: [PATCH] Added fix for videos start to zero out colors and mit styles --- .../xmodule/xmodule/css/sequence/display.scss | 31 +++++++++---------- .../xmodule/xmodule/css/video/display.scss | 9 ++++-- lms/envs/common.py | 2 +- .../sass/course/courseware/_courseware.scss | 3 ++ lms/templates/main.html | 2 +- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index d2ea986a4c..7658797725 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -3,8 +3,9 @@ nav.sequence-nav { // import from external sources. @extend .topbar; - border-bottom: 1px solid darken($cream, 20%); - margin-bottom: $body-line-height; + border-bottom: 1px solid #ddd; + margin: (-(lh())) (-(lh())) lh() (-(lh())); + background: #eee; position: relative; @include border-top-right-radius(4px); @@ -12,6 +13,8 @@ nav.sequence-nav { @include box-sizing(border-box); display: table; height: 100%; + margin: 0; + padding-left: 0; padding-right: flex-grid(1, 9); width: 100%; @@ -20,7 +23,7 @@ nav.sequence-nav { } li { - border-left: 1px solid darken($cream, 20%); + border-left: 1px solid #eee; display: table-cell; min-width: 20px; @@ -32,17 +35,15 @@ nav.sequence-nav { background-repeat: no-repeat; &:hover { - background-color: lighten($cream, 3%); + background-color: #eee; } } .visited { - background-color: #DCCDA2; + background-color: #ddd; background-repeat: no-repeat; - @include box-shadow(inset 0 0 3px darken(#dccda2, 10%)); &:hover { - background-color: $cream; background-position: center center; } } @@ -214,7 +215,7 @@ nav.sequence-nav { &.prev, &.next { a { - background-color: darken($cream, 5%); + // background-color: darken($cream, 5%); background-position: center center; background-repeat: no-repeat; border-left: 1px solid darken(#f6efd4, 20%); @@ -241,7 +242,7 @@ nav.sequence-nav { background-image: url('../images/sequence-nav/previous-icon.png'); &:hover { - background-color: $cream; + // background-color: $cream; } } } @@ -251,7 +252,7 @@ nav.sequence-nav { background-image: url('../images/sequence-nav/next-icon.png'); &:hover { - background-color: $cream; + // background-color: $cream; } } } @@ -273,9 +274,8 @@ nav.sequence-bottom { ul { @extend .clearfix; - background-color: darken(#F6EFD4, 5%); - background-color: darken($cream, 5%); - border: 1px solid darken(#f6efd4, 20%); + background-color: #eee; + border: 1px solid #ddd; @include border-radius(3px); @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); @include inline-block(); @@ -297,14 +297,13 @@ nav.sequence-bottom { width: 45px; &:hover { - background-color: $cream; - color: darken($cream, 60%); + background-color: #ddd; + color: #000; opacity: .5; text-decoration: none; } &.disabled { - background-color: lighten($cream, 10%); opacity: .4; } } diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss index b7187cff26..789a267755 100644 --- a/common/lib/xmodule/xmodule/css/video/display.scss +++ b/common/lib/xmodule/xmodule/css/video/display.scss @@ -114,14 +114,13 @@ div.video { @extend .dullify; float: left; list-style: none; - margin-right: lh(); + margin: 0 lh() 0 0; padding: 0; li { float: left; margin-bottom: 0; - a { border-bottom: none; border-right: 1px solid #000; @@ -183,6 +182,8 @@ div.video { ol.video_speeds { display: block; opacity: 1; + padding: 0; + margin: 0; } } @@ -210,6 +211,7 @@ div.video { font-weight: normal; letter-spacing: 1px; padding: 0 lh(.25) 0 lh(.5); + line-height: 46px; text-transform: uppercase; } @@ -218,6 +220,7 @@ div.video { font-weight: bold; margin-bottom: 0; padding: 0 lh(.5) 0 0; + line-height: 46px; } &:hover, &:active, &:focus { @@ -422,10 +425,12 @@ div.video { } ol.subtitles { + padding-left: 0; float: left; max-height: 460px; overflow: auto; width: flex-grid(3, 9); + margin: 0; li { border: 0; diff --git a/lms/envs/common.py b/lms/envs/common.py index 032a088195..95daa913e8 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -304,7 +304,7 @@ PIPELINE_CSS = { '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.22.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/ui-lightness/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/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index 8a0d880ceb..7fc3fb0fa1 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -59,6 +59,9 @@ div.course-wrapper { } ol.vert-mod { + padding: 0; + margin: 0; + > li { @extend .clearfix; @extend .problem-set; diff --git a/lms/templates/main.html b/lms/templates/main.html index 7ef8960970..fb502bfe22 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -3,7 +3,7 @@ <%block name="title">edX - + <%static:css group='application'/>