Skip to content

Commit 71737b0

Browse files
feat: increased font size for Dates and Course unit pages
1 parent 14c662d commit 71737b0

File tree

11 files changed

+67
-16
lines changed

11 files changed

+67
-16
lines changed

src/course-home/dates-tab/timeline/Day.jsx

+15-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import {
88
injectIntl,
99
intlShape,
1010
} from '@edx/frontend-platform/i18n';
11-
import { Tooltip, OverlayTrigger } from '@openedx/paragon';
11+
import {
12+
Tooltip, OverlayTrigger, breakpoints, useWindowSize,
13+
} from '@openedx/paragon';
1214
import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
1315
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
1416

@@ -30,6 +32,7 @@ const Day = ({
3032
const {
3133
userTimezone,
3234
} = useModel('courseHomeMeta', courseId);
35+
const wideScreen = useWindowSize().width >= breakpoints.medium.minWidth;
3336

3437
const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
3538

@@ -69,9 +72,13 @@ const Day = ({
6972
const textColor = available ? 'text-primary-700' : 'text-gray-500';
7073

7174
return (
72-
<div key={item.title + item.date} className={classNames(textColor, 'small pb-1')} data-testid="dates-item">
75+
<div
76+
key={item.title + item.date}
77+
className={classNames(textColor, 'pb-1', { small: !wideScreen })}
78+
data-testid="dates-item"
79+
>
7380
<div>
74-
<span className="small">
81+
<span className={classNames({ small: !wideScreen })}>
7582
<span className="font-weight-bold">{item.assignmentType && `${item.assignmentType}: `}{title}</span>
7683
{showDueDateTime && (
7784
<span>
@@ -96,7 +103,11 @@ const Day = ({
96103
</OverlayTrigger>
97104
)}
98105
</div>
99-
{item.description && <div className="small mb-2">{item.description}</div>}
106+
{item.description && (
107+
<div className={classNames('mb-2', { small: !wideScreen })}>
108+
{item.description}
109+
</div>
110+
)}
100111
</div>
101112
);
102113
})}

src/course-home/suggested-schedule-messaging/ShiftDatesAlert.jsx

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
22
import { useDispatch, useSelector } from 'react-redux';
3+
import classNames from 'classnames';
34
import PropTypes from 'prop-types';
45

56
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -8,6 +9,8 @@ import {
89
Button,
910
Row,
1011
Col,
12+
breakpoints,
13+
useWindowSize,
1114
} from '@openedx/paragon';
1215

1316
import { resetDeadlines } from '../data';
@@ -18,6 +21,7 @@ const ShiftDatesAlert = ({ fetch, intl, model }) => {
1821
const {
1922
courseId,
2023
} = useSelector(state => state.courseHome);
24+
const wideScreen = useWindowSize().width >= breakpoints.medium.minWidth;
2125

2226
const {
2327
datesBannerInfo,
@@ -38,14 +42,17 @@ const ShiftDatesAlert = ({ fetch, intl, model }) => {
3842
return (
3943
<Alert variant="warning">
4044
<Row className="w-100 m-0">
41-
<Col xs={12} md={9} className="small p-0 pr-md-2">
45+
<Col
46+
xs={12}
47+
md={9}
48+
className={classNames('p-0 pr-md-2 shift-dates-alert-text', { small: !wideScreen })}
49+
>
4250
<strong>{intl.formatMessage(messages.missedDeadlines)}</strong>
4351
{' '}{intl.formatMessage(messages.shiftDatesBody)}
4452
</Col>
4553
<Col xs={12} md={3} className="align-self-center text-right mt-3 mt-md-0 p-0">
4654
<Button
47-
variant="primary"
48-
size="sm"
55+
size={!wideScreen ? 'sm' : 'md'}
4956
className="w-xs-100 w-md-auto"
5057
onClick={() => dispatch(resetDeadlines(courseId, model, fetch))}
5158
>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.upgrade-to-complete-alert-title.h4 {
2+
font-size: $h3-font-size;
3+
font-weight: $font-weight-bold;
4+
}
5+
6+
.upgrade-to-complete-alert-text,
7+
.upgrade-to-shift-dates-alert-text,
8+
.shift-dates-alert-text {
9+
font-size: $font-size-base;
10+
}

src/course-home/suggested-schedule-messaging/UpgradeToCompleteAlert.jsx

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import React from 'react';
22
import { useSelector } from 'react-redux';
33
import PropTypes from 'prop-types';
4+
import classNames from 'classnames';
45
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
56
import {
67
Alert,
78
Button,
89
Col,
910
Row,
11+
breakpoints,
12+
useWindowSize,
1013
} from '@openedx/paragon';
1114

1215
import { useModel } from '../../generic/model-store';
@@ -16,6 +19,7 @@ const UpgradeToCompleteAlert = ({ intl, logUpgradeLinkClick }) => {
1619
const {
1720
courseId,
1821
} = useSelector(state => state.courseHome);
22+
const wideScreen = useWindowSize().width >= breakpoints.medium.minWidth;
1923

2024
const {
2125
datesBannerInfo,
@@ -35,14 +39,18 @@ const UpgradeToCompleteAlert = ({ intl, logUpgradeLinkClick }) => {
3539
return (
3640
<Alert className="bg-light-200">
3741
<Row className="w-100 m-0">
38-
<Col xs={12} md={9} className="small p-0 pr-md-2">
39-
<Alert.Heading>{intl.formatMessage(messages.upgradeToCompleteHeader)}</Alert.Heading>
40-
{intl.formatMessage(messages.upgradeToCompleteBody)}
42+
<Col xs={12} md={9} className={classNames('p-0 pr-md-2', { small: !wideScreen })}>
43+
<Alert.Heading className={classNames({ 'upgrade-to-complete-alert-title': wideScreen })}>
44+
{intl.formatMessage(messages.upgradeToCompleteHeader)}
45+
</Alert.Heading>
46+
<p className={classNames({ 'upgrade-to-complete-alert-text m-0': wideScreen })}>
47+
{intl.formatMessage(messages.upgradeToCompleteBody)}
48+
</p>
4149
</Col>
4250
<Col xs={12} md={3} className="align-self-center text-right mt-3 mt-md-0 p-0">
4351
<Button
4452
variant="brand"
45-
size="sm"
53+
size={!wideScreen ? 'sm' : 'md'}
4654
className="w-xs-100 w-md-auto"
4755
onClick={() => {
4856
logUpgradeLinkClick();

src/course-home/suggested-schedule-messaging/UpgradeToShiftDatesAlert.jsx

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import React from 'react';
22
import { useSelector } from 'react-redux';
33
import PropTypes from 'prop-types';
4+
import classNames from 'classnames';
45

56
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
67
import {
78
Alert,
89
Button,
910
Row,
1011
Col,
12+
breakpoints,
13+
useWindowSize,
1114
} from '@openedx/paragon';
1215

1316
import { useModel } from '../../generic/model-store';
@@ -17,6 +20,7 @@ const UpgradeToShiftDatesAlert = ({ intl, logUpgradeLinkClick, model }) => {
1720
const {
1821
courseId,
1922
} = useSelector(state => state.courseHome);
23+
const wideScreen = useWindowSize().width >= breakpoints.medium.minWidth;
2024

2125
const {
2226
datesBannerInfo,
@@ -37,14 +41,18 @@ const UpgradeToShiftDatesAlert = ({ intl, logUpgradeLinkClick, model }) => {
3741
return (
3842
<Alert className="bg-light-200">
3943
<Row className="w-100 m-0">
40-
<Col xs={12} md={9} className="small p-0 pr-md-2">
44+
<Col
45+
xs={12}
46+
md={9}
47+
className={classNames('p-0 pr-md-2', { 'upgrade-to-shift-dates-alert-text': wideScreen })}
48+
>
4149
<strong>{intl.formatMessage(messages.missedDeadlines)}</strong>
4250
{' '}{intl.formatMessage(messages.upgradeToShiftBody)}
4351
</Col>
4452
<Col xs={12} md={3} className="align-self-center text-right mt-3 mt-md-0 p-0">
4553
<Button
4654
variant="brand"
47-
size="sm"
55+
size={!wideScreen ? 'sm' : 'md'}
4856
className="w-xs-100 w-md-auto"
4957
onClick={() => {
5058
logUpgradeLinkClick();

src/courseware/course/sidebar/sidebars/notifications/NotificationTray.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const NotificationTray = ({ intl }) => {
8585
}}
8686
/>
8787
) : (
88-
<p className="p-3 small">{intl.formatMessage(messages.noNotificationsMessage)}</p>
88+
<p className="p-3">{intl.formatMessage(messages.noNotificationsMessage)}</p>
8989
)}
9090
</div>
9191
</SidebarBase>

src/generic/upgrade-notification/UpgradeNotification.jsx

Whitespace-only changes.

src/generic/upgrade-notification/UpgradeNotification.scss

Whitespace-only changes.

src/generic/user-messages/Alert.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const Alert = ({
3939
dismissible={dismissible}
4040
onClose={onDismiss}
4141
stacked={stacked}
42+
className={`alert-container-${type}`}
4243
>
4344
{children}
4445
</ParagonAlert>

src/generic/user-messages/Alert.scss

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.alert-container-info .alert-message-content {
2+
font-size: $font-size-base;
3+
}

src/index.scss

+5-2
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,12 @@
446446
.course-outline-tab .pgn__card {
447447
.pgn__card-header {
448448
display: block;
449-
449+
450450
.pgn__card-header-content {
451451
margin-top: 0;
452452
}
453453
}
454-
454+
455455
.pgn__card-header-actions {
456456
margin-left: 0;
457457
}
@@ -466,8 +466,11 @@
466466
@import "courseware/course/content-tools/calculator/calculator.scss";
467467
@import "courseware/course/content-tools/contentTools.scss";
468468
@import "course-home/dates-tab/timeline/Day.scss";
469+
@import "generic/user-messages/Alert.scss";
470+
@import "generic/upsell-bullets/UpsellBullets.scss";
469471
@import "course-home/outline-tab/widgets/ProctoringInfoPanel.scss";
470472
@import "course-home/outline-tab/widgets/FlagButton.scss";
473+
@import "course-home/suggested-schedule-messaging/SuggestedScheduleMessaging.scss";
471474
@import "course-home/progress-tab/course-completion/CompletionDonutChart.scss";
472475
@import "course-home/progress-tab/grades/course-grade/GradeBar.scss";
473476
@import "courseware/course/course-exit/CourseRecommendations";

0 commit comments

Comments
 (0)