From b2d534da610c8ef6d295d6d700ad84aecbe643a4 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 16 Nov 2017 16:33:50 -0500 Subject: [PATCH 1/3] Show current tab even in high contrast mode In the dashboard header and the course navigation bar, the current tab is supposed to be the only one with a bottom border. But in high contrast mode in Windows, all of them were assigned a bottom border color. So instead of toggling the color when active, toggle the border style, since Windows overrides our color choice anyway. LEARNER-3219 --- lms/static/sass/_header.scss | 4 ++-- lms/static/sass/course/layout/_courseware_header.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/static/sass/_header.scss b/lms/static/sass/_header.scss index d48d926a55..b6e77fce1f 100644 --- a/lms/static/sass/_header.scss +++ b/lms/static/sass/_header.scss @@ -102,12 +102,12 @@ font-weight: $font-weight-normal; display: inline-block; margin-bottom: -1*$baseline/2; - border-bottom: 4px solid transparent; + border-bottom: 4px hidden theme-color("dark"); cursor: pointer; &.active, &:hover { - border-bottom-color: theme-color("dark"); + border-bottom-style: solid; } &:hover { diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss index 5f446ab492..2a28fa2f15 100644 --- a/lms/static/sass/course/layout/_courseware_header.scss +++ b/lms/static/sass/course/layout/_courseware_header.scss @@ -52,13 +52,13 @@ display: block; text-align: center; text-decoration: none; - border-bottom: 4px solid transparent; + border-bottom: 4px hidden theme-color("primary"); &:hover, &:focus, &.active { color: theme-color("primary"); - border-bottom-color: theme-color("primary"); + border-bottom-style: solid; background-color: transparent; } } From 96c737d1cb1f85ccba9b8f62c96e0b2a7da52dfc Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 21 Nov 2017 11:16:48 -0500 Subject: [PATCH 2/3] Fix focus loss when bookmarking a page in IE In IE, when a user presses the bookmark/remove-bookmark button, the focus was lost on that button because we set disabled=true while we do the operation. Set the focus back when we are done. LEARNER-2896 --- .../static/course_bookmarks/js/views/bookmark_button.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js b/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js index 5dece91125..d1179edfb4 100644 --- a/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js +++ b/openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js @@ -58,6 +58,7 @@ }, complete: function() { view.$el.prop('disabled', false); + view.$el.focus(); } }); }, @@ -78,6 +79,7 @@ }, complete: function() { view.$el.prop('disabled', false); + view.$el.focus(); } }); }, @@ -105,7 +107,7 @@ } this.messageView.showMessage(errorMsg); - // Hide message automatically after some interval + // Hide message automatically after some interval setTimeout(_.bind(function() { this.messageView.hideMessage(); }, this), this.showBannerInterval); From 3244fc0d67a6bbcf5520fd30fb2d6950ee7e6b2c Mon Sep 17 00:00:00 2001 From: Sofiya Semenova Date: Mon, 20 Nov 2017 14:47:28 -0500 Subject: [PATCH 3/3] Educator 1560 - Clean up labelling in the Discussion Add Post form --- .../discussion/thread-type.underscore | 52 +++++++++---------- .../templates/discussion/topic.underscore | 18 +++---- .../discussion/views/_create-edit-post.scss | 3 +- 3 files changed, 35 insertions(+), 38 deletions(-) diff --git a/common/static/common/templates/discussion/thread-type.underscore b/common/static/common/templates/discussion/thread-type.underscore index 7e6c3a19b8..b3c505859d 100644 --- a/common/static/common/templates/discussion/thread-type.underscore +++ b/common/static/common/templates/discussion/thread-type.underscore @@ -1,32 +1,30 @@
-
+ +
+ <%- gettext("Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)") %> +
+
+ + +
+ diff --git a/common/static/common/templates/discussion/topic.underscore b/common/static/common/templates/discussion/topic.underscore index 1ea118fd44..7a92973e6d 100644 --- a/common/static/common/templates/discussion/topic.underscore +++ b/common/static/common/templates/discussion/topic.underscore @@ -1,13 +1,13 @@ -