diff --git a/src/course-home/dates-tab/timeline/badgelist.jsx b/src/course-home/dates-tab/timeline/badgelist.jsx index 0c5cc69668..4a486e9abc 100644 --- a/src/course-home/dates-tab/timeline/badgelist.jsx +++ b/src/course-home/dates-tab/timeline/badgelist.jsx @@ -38,21 +38,21 @@ function getBadgeListAndColor(date, intl, item, items) { message: messages.today, shownForDay: isToday, bg: 'bg-warning-300', - className: 'text-black', + className: 'text-dark', }, { message: messages.completed, shownForDay: assignments.length && assignments.every(isComplete), shownForItem: x => isLearnerAssignment(x) && isComplete(x), bg: 'bg-light-500', - className: 'text-black', + className: 'text-dark', }, { message: messages.pastDue, shownForDay: assignments.length && assignments.every(isPastDue), shownForItem: x => isLearnerAssignment(x) && isPastDue(x), bg: 'bg-dark-200', - className: 'text-white', + className: 'text-dark', }, { message: messages.dueNext, diff --git a/src/course-home/outline-tab/LmsHtmlFragment.jsx b/src/course-home/outline-tab/LmsHtmlFragment.jsx index 191663554c..a07c06548b 100644 --- a/src/course-home/outline-tab/LmsHtmlFragment.jsx +++ b/src/course-home/outline-tab/LmsHtmlFragment.jsx @@ -9,8 +9,9 @@ const LmsHtmlFragment = ({ title, ...rest }) => { + const direction = document.documentElement?.getAttribute('dir') || 'ltr'; const wholePage = ` - + diff --git a/src/course-home/progress-tab/ProgressTab.jsx b/src/course-home/progress-tab/ProgressTab.jsx index 3413d3836f..867035f3c2 100644 --- a/src/course-home/progress-tab/ProgressTab.jsx +++ b/src/course-home/progress-tab/ProgressTab.jsx @@ -18,7 +18,7 @@ const ProgressTab = () => { } = useSelector(state => state.courseHome); const { - gradesFeatureIsFullyLocked, + gradesFeatureIsFullyLocked, disableProgressGraph, } = useModel('progress', courseId); const applyLockedOverlay = gradesFeatureIsFullyLocked ? 'locked-overlay' : ''; @@ -38,7 +38,7 @@ const ProgressTab = () => {
{/* Main body */}
- + {!disableProgressGraph && } {!wideScreen && }
diff --git a/src/courseware/course/sequence/Sequence.jsx b/src/courseware/course/sequence/Sequence.jsx index 529c09b83b..c7b717a69f 100644 --- a/src/courseware/course/sequence/Sequence.jsx +++ b/src/courseware/course/sequence/Sequence.jsx @@ -140,26 +140,28 @@ const Sequence = ({ const gated = sequence && sequence.gatedContent !== undefined && sequence.gatedContent.gated; const defaultContent = ( -
+
- { - logEvent('edx.ui.lms.sequence.next_selected', 'top'); - handleNext(); - }} - onNavigate={(destinationUnitId) => { - logEvent('edx.ui.lms.sequence.tab_selected', 'top', destinationUnitId); - handleNavigate(destinationUnitId); - }} - previousHandler={() => { - logEvent('edx.ui.lms.sequence.previous_selected', 'top'); - handlePrevious(); - }} - /> - {shouldDisplayNotificationTriggerInSequence && } +
+ { + logEvent('edx.ui.lms.sequence.next_selected', 'top'); + handleNext(); + }} + onNavigate={(destinationUnitId) => { + logEvent('edx.ui.lms.sequence.tab_selected', 'top', destinationUnitId); + handleNavigate(destinationUnitId); + }} + previousHandler={() => { + logEvent('edx.ui.lms.sequence.previous_selected', 'top'); + handlePrevious(); + }} + /> + {shouldDisplayNotificationTriggerInSequence && } +
+ ); }; diff --git a/src/courseware/course/sidebar/SidebarTriggers.jsx b/src/courseware/course/sidebar/SidebarTriggers.jsx index 9ef7b724bb..cdc255d52d 100644 --- a/src/courseware/course/sidebar/SidebarTriggers.jsx +++ b/src/courseware/course/sidebar/SidebarTriggers.jsx @@ -1,5 +1,6 @@ import classNames from 'classnames'; import React, { useContext } from 'react'; +import { breakpoints, useWindowSize } from '@edx/paragon'; import SidebarContext from './SidebarContext'; import { SIDEBAR_ORDER, SIDEBARS } from './sidebars'; @@ -8,6 +9,9 @@ const SidebarTriggers = () => { toggleSidebar, currentSidebar, } = useContext(SidebarContext); + + const isMobileView = useWindowSize().width < breakpoints.small.minWidth; + return (
{SIDEBAR_ORDER.map((sidebarId) => { @@ -15,7 +19,7 @@ const SidebarTriggers = () => { const isActive = sidebarId === currentSidebar; return (
diff --git a/src/courseware/course/sidebar/common/TriggerBase.jsx b/src/courseware/course/sidebar/common/TriggerBase.jsx index 16c2845041..5800fb55c8 100644 --- a/src/courseware/course/sidebar/common/TriggerBase.jsx +++ b/src/courseware/course/sidebar/common/TriggerBase.jsx @@ -8,7 +8,7 @@ const SidebarTriggerBase = ({ children, }) => (