From ee92ba0752f68a49fb10a3e3763677627ceef9a4 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Mon, 20 Aug 2012 17:56:51 -0400 Subject: [PATCH] new sequence nav; new courseware sidebar; new textbook styling; fixed gradebook glitch --- lms/static/sass/course/_gradebook.scss | 3 ++ lms/static/sass/course/_info.scss | 2 +- lms/static/sass/course/_textbook.scss | 21 ++++++------ lms/static/sass/course/base/_extends.scss | 2 +- .../sass/course/courseware/_courseware.scss | 11 +++++++ .../sass/course/courseware/_sidebar.scss | 32 ++++++++++++------- 6 files changed, 49 insertions(+), 22 deletions(-) diff --git a/lms/static/sass/course/_gradebook.scss b/lms/static/sass/course/_gradebook.scss index cd3205149c..d8be7d779a 100644 --- a/lms/static/sass/course/_gradebook.scss +++ b/lms/static/sass/course/_gradebook.scss @@ -6,6 +6,9 @@ div.gradebook-wrapper { section.gradebook-content { @extend .content; + display: block; + width: 100%; + @include clearfix; .student-search { padding: 0 20px 0 15px; diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index 9a64c9d042..8cc5293246 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -69,7 +69,7 @@ div.info-wrapper { section.handouts { @extend .sidebar; @include border-radius(0 4px 4px 0); - border-right: 0; + border-left: 1px solid #ddd; @include box-shadow(none); font-size: 14px; diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss index 8e88f8befd..73a215a46c 100644 --- a/lms/static/sass/course/_textbook.scss +++ b/lms/static/sass/course/_textbook.scss @@ -1,10 +1,17 @@ div.book-wrapper { @extend .table-wrapper; + #open_close_accordion { + display: none; + } + section.book-sidebar { @extend .sidebar; @extend .tran; @include box-sizing(border-box); + padding: 10px 0; + border-radius: 3px 0 0 3px; + border-right: 1px solid #ccc; ul#booknav { font-size: em(14); @@ -33,7 +40,7 @@ div.book-wrapper { li { background: none; border-bottom: 0; - padding-left: lh(); + padding-left: lh(); a { padding: 0; @@ -50,7 +57,7 @@ div.book-wrapper { div.hitarea { background-image: url('../images/treeview-default.gif'); - margin-left: -22px; + position: relative; top: 4px; @@ -63,27 +70,23 @@ div.book-wrapper { ul { background: none; margin-top: lh(.25); - border-top: 1px solid $border-color; padding-top: lh(.25); li { - padding-bottom: lh(.25); + padding-bottom: 10px; } } } > li { - border-bottom: 1px solid $border-color; - padding: 7px 7px 7px 30px; + padding: 5px 6px; + margin: 0 16px 5px 25px; } } } section.book { @extend .content; - padding-bottom: 0; - padding-right: 0; - padding-top: 0; nav { @extend .clearfix; diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index 7087fd3568..35ea19ee91 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -54,7 +54,7 @@ h1.top-header { text-transform: none; font-family: $sans-serif; text-align: left; - font-style: italic; + font-style: normal; } a { diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index 198902c146..28bd817607 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -12,6 +12,7 @@ div.course-wrapper { section.course-content { @extend .content; + padding-top: 0 !important; @include border-radius(0 4px 4px 0); h1 { @@ -45,6 +46,7 @@ div.course-wrapper { ol.vert-mod { padding: 0; margin: 0; + line-height: 1.4; > li { @extend .clearfix; @@ -210,3 +212,12 @@ div.course-wrapper { } } } + +.xmodule_VideoModule { + margin-bottom: 30px; + + +} + + + diff --git a/lms/static/sass/course/courseware/_sidebar.scss b/lms/static/sass/course/courseware/_sidebar.scss index e516939297..7c884bf5d3 100644 --- a/lms/static/sass/course/courseware/_sidebar.scss +++ b/lms/static/sass/course/courseware/_sidebar.scss @@ -90,8 +90,7 @@ section.course-index { li { border-bottom: 0; @include border-radius(0); - margin-bottom: lh(.5); - line-height: 1.4; + margin-bottom: 4px; a { background: transparent; @@ -105,20 +104,18 @@ section.course-index { font-weight: bold; font-family: $sans-serif; margin-bottom: 0; + line-height: 1.3; span.subtitle { color: #666; + font-size: 13px; font-weight: normal; display: block; } - } + } &:hover { - &:after { - opacity: 1; - right: 15px; - @include transition(); - } + background: #fff; > a p { color: #333; @@ -136,12 +133,25 @@ section.course-index { } &.active { - font-weight: bold; + font-weight: bold; + + &:after { + content: '›'; + position: absolute; + top: 50%; + right: 20px; + margin-top: -13px; + font-size: 30px; + font-weight: normal; + color: #333; + opacity: 0; + @include transition(); + } > a { - border: none; + border: 1px solid #bbb; @include box-shadow(0 1px 0 rgba(255, 255, 255, .35) inset); - @include linear-gradient(top, #ddd, #bbb); + @include linear-gradient(top, #e6e6e6, #d6d6d6); &:after { opacity: 1;