From 5950520e71ec18c243aab608e606e35308256fa9 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Thu, 23 Aug 2012 11:11:22 -0400 Subject: [PATCH] tweaked sequence nav and discussion profile sidebar --- .../lib/xmodule/xmodule/css/sequence/display.scss | 13 ++++++------- .../xmodule/xmodule/js/src/sequence/display.coffee | 1 + lms/static/js/jquery.sequence.js | 5 ----- lms/static/sass/_discussion.scss | 5 +++++ lms/templates/seq_module.html | 3 --- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index ba8e94f851..7b8dc5f57c 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -61,13 +61,12 @@ nav.sequence-nav { min-width: 20px; a { - width: 34px; - height: 34px; - margin: 4px auto; - background-position: center 10px; + width: 100%; + height: 42px; + margin: 0; + background-position: center 14px; background-repeat: no-repeat; border: 1px solid transparent; - @include border-radius(35px); cursor: pointer; display: block; padding: 0; @@ -82,7 +81,7 @@ nav.sequence-nav { &:hover { background-color: #fff; background-repeat: no-repeat; - background-position: center 10px; + background-position: center 14px; } &.active { @@ -103,7 +102,7 @@ nav.sequence-nav { &:hover { background-color: #fff; background-repeat: no-repeat; - background-position: center 10px; + background-position: center 14px; } } diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee index 38291be2ef..35a33a9ea1 100644 --- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee @@ -55,6 +55,7 @@ class @Sequence element.removeClass('progress-none') .removeClass('progress-some') .removeClass('progress-done') + switch progress when 'none' then element.addClass('progress-none') when 'in_progress' then element.addClass('progress-some') diff --git a/lms/static/js/jquery.sequence.js b/lms/static/js/jquery.sequence.js index 5406444eed..fbefb8a8ce 100644 --- a/lms/static/js/jquery.sequence.js +++ b/lms/static/js/jquery.sequence.js @@ -27,11 +27,6 @@ var SequenceNav = function($element) { var offset = e.pageX - mouseOrigin; var targetLeft = clamp(listOrigin + offset, -maxScroll, 0); - console.log('---------------'); - console.log('offset: ' + offset); - console.log('target left: ' + targetLeft); - console.log('max: ' + maxScroll); - updateHorizontalPosition(targetLeft); setShadows(targetLeft); diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 717770f459..b44f8120b9 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -150,10 +150,15 @@ $tag-text-color: #5b614f; //user profile + .user-profile { + @extend .sidebar; + } + .sidebar-username { font-size: 1.5em; font-weight: bold; line-height: 1.5em; + margin-top: 20px; } .sidebar-user-roles { diff --git a/lms/templates/seq_module.html b/lms/templates/seq_module.html index 9e26543fbd..8ff3e096dd 100644 --- a/lms/templates/seq_module.html +++ b/lms/templates/seq_module.html @@ -40,9 +40,6 @@