diff --git a/src/course-home/dates-tab/Badge.jsx b/src/course-home/dates-tab/Badge.jsx index c4f9304b..aa0d191f 100644 --- a/src/course-home/dates-tab/Badge.jsx +++ b/src/course-home/dates-tab/Badge.jsx @@ -2,11 +2,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -export default function Badge({ children, className }) { +export default function Badge({ children, className, ...rest }) { return ( {children} diff --git a/src/course-home/dates-tab/Badge.scss b/src/course-home/dates-tab/Badge.scss index f4368cfe..ec65b4e9 100644 --- a/src/course-home/dates-tab/Badge.scss +++ b/src/course-home/dates-tab/Badge.scss @@ -1,4 +1,4 @@ .dates-badge { border-radius: 4px; - padding: 2px 8px 3px 8px; + padding: 1px 8px; } diff --git a/src/course-home/dates-tab/Day.jsx b/src/course-home/dates-tab/Day.jsx index df987d30..e052d2ff 100644 --- a/src/course-home/dates-tab/Day.jsx +++ b/src/course-home/dates-tab/Day.jsx @@ -2,7 +2,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import { useSelector } from 'react-redux'; -import { FormattedDate, injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { + FormattedDate, + FormattedTime, + injectIntl, + intlShape, +} from '@edx/frontend-platform/i18n'; import { Tooltip, OverlayTrigger } from '@edx/paragon'; import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; @@ -51,7 +56,7 @@ function Day({ {/* Content */}
-

+

{item.title}) : item.title; const available = item.learnerHasAccess && (item.link || !isLearnerAssignment(item)); - const textColor = available ? 'text-dark-500' : 'text-dark-200'; + const textColor = available ? 'text-primary-700' : 'text-gray-500'; return ( -

+
- - {item.assignmentType && `${item.assignmentType}: `}{title} + + {item.assignmentType && `${item.assignmentType}: `}{title} + {showDueDateTime && ( + + due + + + )} {itemBadges} {item.extraInfo && ( diff --git a/src/course-home/dates-tab/badgelist.jsx b/src/course-home/dates-tab/badgelist.jsx index df819a0b..e755b9e7 100644 --- a/src/course-home/dates-tab/badgelist.jsx +++ b/src/course-home/dates-tab/badgelist.jsx @@ -77,6 +77,7 @@ function getBadgeListAndColor(date, intl, item, items) { }, ]; let color = null; // first color of any badge + const marginTopStyle = item ? { marginTop: 0 } : { marginTop: '2px' }; const badges = ( <> {badgesInfo.map(b => { @@ -96,7 +97,7 @@ function getBadgeListAndColor(date, intl, item, items) { color = b.bg; } return ( - + {b.icon && } {intl.formatMessage(b.message)}