From a080631751ac99d3db9d52d07bd5dda19736dd45 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 15 Aug 2012 15:44:19 -0400 Subject: [PATCH 1/2] Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav --- .../lib/xmodule/xmodule/css/sequence/display.scss | 2 +- common/lib/xmodule/xmodule/css/video/display.scss | 2 +- lms/djangoapps/courseware/access.py | 4 ++++ lms/static/sass/course/_info.scss | 7 ++++++- lms/static/sass/course/_profile.scss | 5 +++++ lms/static/sass/course/base/_base.scss | 4 ++++ lms/static/sass/course/base/_extends.scss | 14 +++++++++++++- lms/static/sass/course/discussion/_sidebar.scss | 5 +++++ 8 files changed, 39 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 97a8e0e4b3d9..a745129a68f8 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -4,7 +4,7 @@ nav.sequence-nav { @extend .topbar; border-bottom: 1px solid $border-color; @include border-top-right-radius(4px); - margin: (-(lh())) (-(lh())) lh() (-(lh())); + margin: 0 0 lh() (-(lh())); position: relative; ol { diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss index 8d0c4ac5221b..9e32de941a0f 100644 --- a/common/lib/xmodule/xmodule/css/video/display.scss +++ b/common/lib/xmodule/xmodule/css/video/display.scss @@ -4,7 +4,7 @@ div.video { border-bottom: 1px solid #e1e1e1; border-top: 1px solid #e1e1e1; display: block; - margin: 0 (-(lh())); + margin: 0 0 0 (-(lh())); padding: 6px lh(); article.video-wrapper { diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py index e588f807dab4..69d9839045b1 100644 --- a/lms/djangoapps/courseware/access.py +++ b/lms/djangoapps/courseware/access.py @@ -84,8 +84,12 @@ def _has_access_course_desc(user, course, action): 'staff' -- staff access to course. """ def can_load(): +<<<<<<< Updated upstream """ Can this user load this course? +======= + """Can this user load this course? +>>>>>>> Stashed changes NOTE: this is not checking whether user is actually enrolled in the course. """ diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index 1651ad4da863..e68e38669603 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -69,10 +69,15 @@ div.info-wrapper { section.handouts { @extend .sidebar; border-left: 1px solid $border-color; - @include border-radius(0 4px 4px 0); border-right: 0; + @include border-radius(0 4px 4px 0); @include box-shadow(none); + &:after { + left: -1px; + right: auto; + } + h1 { @extend .bottom-border; margin-bottom: 0; diff --git a/lms/static/sass/course/_profile.scss b/lms/static/sass/course/_profile.scss index 006bd902e55c..5b1d6ee0687d 100644 --- a/lms/static/sass/course/_profile.scss +++ b/lms/static/sass/course/_profile.scss @@ -8,6 +8,11 @@ div.profile-wrapper { @include border-radius(0px 4px 4px 0); border-right: 0; + &:after { + left: -1px; + right: auto; + } + header { @extend .bottom-border; margin: 0; diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index 90c8fdc3e21a..9f0be9c29802 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -31,6 +31,10 @@ img { max-width: 100%; } +.container { + padding: em(40) 0; +} + ::selection, ::-moz-selection, ::-webkit-selection { background:#444; color:#fff; diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index a438b931508f..78618df83da4 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -49,6 +49,18 @@ h1.top-header { vertical-align: top; width: flex-grid(3); + &:after { + width: 1px; + height: 100%; + @include position(absolute, 0px -1px 0px 0); + content: ""; + @include background-image(linear-gradient(top, #fff, rgba(#fff, 0)), linear-gradient(top, rgba(#fff, 0), #fff)); + background-position: top, bottom; + @include background-size(1px 20px); + background-repeat: no-repeat; + display: block; + } + h1, h2 { font-size: em(20); font-weight: 100; @@ -137,7 +149,7 @@ h1.top-header { position: absolute; right: -1px; text-indent: -9999px; - top: 6px; + top: 12px; width: 16px; z-index: 99; diff --git a/lms/static/sass/course/discussion/_sidebar.scss b/lms/static/sass/course/discussion/_sidebar.scss index 7ee435f8af53..59dcfaf449ae 100644 --- a/lms/static/sass/course/discussion/_sidebar.scss +++ b/lms/static/sass/course/discussion/_sidebar.scss @@ -6,6 +6,11 @@ div.discussion-wrapper aside { border-right: 0; width: flex-grid(3); + &:after { + left: -1px; + right: auto; + } + &.main-sidebar { min-width:200px; } From 6c8e1f27b27938a7615df1afcf46189c68619f60 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 15 Aug 2012 15:53:37 -0400 Subject: [PATCH 2/2] Fix conflicts --- lms/djangoapps/courseware/access.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py index 69d9839045b1..e588f807dab4 100644 --- a/lms/djangoapps/courseware/access.py +++ b/lms/djangoapps/courseware/access.py @@ -84,12 +84,8 @@ def _has_access_course_desc(user, course, action): 'staff' -- staff access to course. """ def can_load(): -<<<<<<< Updated upstream """ Can this user load this course? -======= - """Can this user load this course? ->>>>>>> Stashed changes NOTE: this is not checking whether user is actually enrolled in the course. """