diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index aafc0e7503..d8ed3d1347 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -313,12 +313,20 @@ $seq-nav-height: 50px; &:hover, &:active, &.active { - border-bottom: 3px solid $seq-nav-link-color; - // keeps icon/text centered on hover, necessary due to border-box setting padding-top: 2px; + background-color: theme-color("primary"); .icon { - color: $seq-nav-icon-color; + color: theme-color("inverse"); + } + + @include media-breakpoint-up(sm) { + border-bottom: 3px solid $seq-nav-link-color; + background-color: theme-color("inverse"); + + .icon { + color: $seq-nav-icon-color; + } } } } diff --git a/common/lib/xmodule/xmodule/js/fixtures/sequence.html b/common/lib/xmodule/xmodule/js/fixtures/sequence.html index 43acc02f7d..e73d4275f5 100644 --- a/common/lib/xmodule/xmodule/js/fixtures/sequence.html +++ b/common/lib/xmodule/xmodule/js/fixtures/sequence.html @@ -5,6 +5,10 @@ Previous + -
diff --git a/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html b/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html index bad1389b1b..82863b484c 100644 --- a/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html +++ b/lms/djangoapps/discussion/templates/discussion/discussion_board_fragment.html @@ -33,7 +33,7 @@ from openedx.core.djangolib.markup import HTML
## Add Post button % if has_permission(user, 'create_thread', course.id): -
+
% endif diff --git a/lms/static/sass/_variables.scss b/lms/static/sass/_variables.scss index 2f3b04240d..dff9826b94 100644 --- a/lms/static/sass/_variables.scss +++ b/lms/static/sass/_variables.scss @@ -1,6 +1,6 @@ // LMS-specific variables -$text-width-readability-max: 900px; +$text-width-readability-max: 1080px; // LMS-only colors $audit-mode-color: rgb(74, 74, 74) !default; diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index 683249ead3..53697a0e4c 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -41,6 +41,7 @@ html.video-fullscreen { border-radius: ($baseline/4); background-color: $light-gray1; color: $staff-color; + text-transform: uppercase; &:hover { background-color: $staff-color; @@ -134,12 +135,11 @@ html.video-fullscreen { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; - } + margin: 0 auto; - // Make text-focused blocks have a maximum width for readability. - .xmodule_HtmlModule, - .xmodule_CapaModule { - max-width: $text-width-readability-max; + &.xblock-student_view-vertical { + max-width: $text-width-readability-max; + } } h1 { diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss index e19126c74d..d1f5ed96ca 100644 --- a/lms/static/sass/course/instructor/_instructor_2.scss +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -293,7 +293,7 @@ .btn-link { display: inline-block; - padding: ($baseline/2) $baseline; + padding: ($baseline/2); border: 0; box-shadow: none; text-shadow: none; diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index 9a4e542111..8388374fe4 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -177,6 +177,8 @@ .forum-nav-thread-list { padding-left: 0 !important; // should *not* be RTLed, see below for explanation min-height: 60px; // @TODO: Remove this when we have a real empty state for the discussion thread list + max-height: 800px; + border-bottom: 1px solid theme-color("light"); margin: 0; overflow-y: auto; list-style: none; diff --git a/lms/static/sass/discussion/views/_search.scss b/lms/static/sass/discussion/views/_search.scss index 5425b2f4b7..a7a36c5c1f 100644 --- a/lms/static/sass/discussion/views/_search.scss +++ b/lms/static/sass/discussion/views/_search.scss @@ -1,6 +1,5 @@ .forum-search { display: flex; - width: 100%; margin-top: $baseline; .search-input { diff --git a/lms/static/sass/elements/_banners.scss b/lms/static/sass/elements/_banners.scss index ecfa3d8622..9765a978cb 100644 --- a/lms/static/sass/elements/_banners.scss +++ b/lms/static/sass/elements/_banners.scss @@ -89,6 +89,7 @@ $full-width-banner-margin: 20px; .btn-link { color: $state-info-text-link; font-weight: bold; + border-color: transparent; } } diff --git a/lms/static/sass/features/_course-experience.scss b/lms/static/sass/features/_course-experience.scss index e98242bcea..b3fa1ee0a7 100644 --- a/lms/static/sass/features/_course-experience.scss +++ b/lms/static/sass/features/_course-experience.scss @@ -199,6 +199,7 @@ .btn-link { color: palette(grayscale, base); + border-color: transparent; } } } @@ -275,8 +276,14 @@ } } - .section-tools .course-tool:not(:first-child) { - margin-top: ($baseline / 5); + .section-tools .course-tool { + .course-tool-link:visited { + color: theme-color("primary"); + } + + &:not(:first-child) { + margin-top: ($baseline / 5); + } } } @@ -328,6 +335,8 @@ margin: 0 0 ($baseline / 2) 0; .subsection { + @include margin-left(10px); + list-style-type: none; border: 1px solid transparent; border-radius: 3px; diff --git a/lms/templates/seq_module.html b/lms/templates/seq_module.html index 094fef2178..dfdfd340c3 100644 --- a/lms/templates/seq_module.html +++ b/lms/templates/seq_module.html @@ -13,11 +13,11 @@
% endif
- - diff --git a/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html b/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html index caf6e61581..b753b1b4c9 100644 --- a/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html +++ b/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html @@ -65,7 +65,7 @@
  1. -

    Testing

    +

    Testing

    1. diff --git a/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html b/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html index c03a87af5e..484a153e29 100644 --- a/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html +++ b/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html @@ -24,7 +24,7 @@ from openedx.core.djangolib.markup import HTML, Text tabindex="0" >
      -

      ${ section['display_name'] }

      +

      ${ section['display_name'] }

        % for subsection in section.get('children', []):