Skip to content

Commit 92d8f63

Browse files
fix: sequence container width and responsive for sequence navigation block (#1219)
1 parent c3b786c commit 92d8f63

File tree

6 files changed

+49
-27
lines changed

6 files changed

+49
-27
lines changed

src/courseware/course/sequence/Sequence.jsx

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,30 @@ const Sequence = ({
144144
const gated = sequence && sequence.gatedContent !== undefined && sequence.gatedContent.gated;
145145

146146
const defaultContent = (
147-
<div className="sequence-container d-inline-flex flex-row">
147+
<div className="sequence-container d-inline-flex flex-row w-100">
148148
<div className={classNames('sequence w-100', { 'position-relative': shouldDisplayNotificationTriggerInSequence })}>
149-
<SequenceNavigation
150-
sequenceId={sequenceId}
151-
unitId={unitId}
152-
className="mb-4"
153-
nextHandler={() => {
154-
logEvent('edx.ui.lms.sequence.next_selected', 'top');
155-
handleNext();
156-
}}
157-
onNavigate={(destinationUnitId) => {
158-
logEvent('edx.ui.lms.sequence.tab_selected', 'top', destinationUnitId);
159-
handleNavigate(destinationUnitId);
160-
}}
161-
previousHandler={() => {
162-
logEvent('edx.ui.lms.sequence.previous_selected', 'top');
163-
handlePrevious();
164-
}}
165-
/>
166-
{shouldDisplayNotificationTriggerInSequence && (
167-
enableNewSidebar === 'true' ? <NewSidebarTriggers /> : <SidebarTriggers />
168-
)}
149+
<div className="sequence-navigation-container">
150+
<SequenceNavigation
151+
sequenceId={sequenceId}
152+
unitId={unitId}
153+
className="mb-4"
154+
nextHandler={() => {
155+
logEvent('edx.ui.lms.sequence.next_selected', 'top');
156+
handleNext();
157+
}}
158+
onNavigate={(destinationUnitId) => {
159+
logEvent('edx.ui.lms.sequence.tab_selected', 'top', destinationUnitId);
160+
handleNavigate(destinationUnitId);
161+
}}
162+
previousHandler={() => {
163+
logEvent('edx.ui.lms.sequence.previous_selected', 'top');
164+
handlePrevious();
165+
}}
166+
/>
167+
{shouldDisplayNotificationTriggerInSequence && (
168+
enableNewSidebar === 'true' ? <NewSidebarTriggers /> : <SidebarTriggers />
169+
)}
170+
</div>
169171

170172
<div className="unit-container flex-grow-1">
171173
<SequenceContent

src/courseware/course/sequence/sequence-navigation/SequenceNavigation.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,10 @@ const SequenceNavigation = ({
110110
};
111111

112112
return sequenceStatus === LOADED && (
113-
<nav id="courseware-sequenceNavigation" className={classNames('sequence-navigation', className)} style={{ width: shouldDisplayNotificationTriggerInSequence ? '90%' : null }}>
113+
<nav id="courseware-sequenceNavigation" className={classNames('sequence-navigation', className, { 'mr-2': shouldDisplayNotificationTriggerInSequence })}>
114114
{renderPreviousButton()}
115115
{renderUnitButtons()}
116116
{renderNextButton()}
117-
118117
</nav>
119118
);
120119
};

src/courseware/course/sidebar/SidebarTriggers.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import classNames from 'classnames';
22
import React, { useContext } from 'react';
3+
import { breakpoints, useWindowSize } from '@edx/paragon';
34
import SidebarContext from './SidebarContext';
45
import { SIDEBAR_ORDER, SIDEBARS } from './sidebars';
56

@@ -8,14 +9,17 @@ const SidebarTriggers = () => {
89
toggleSidebar,
910
currentSidebar,
1011
} = useContext(SidebarContext);
12+
13+
const isMobileView = useWindowSize().width < breakpoints.small.minWidth;
14+
1115
return (
1216
<div className="d-flex ml-auto">
1317
{SIDEBAR_ORDER.map((sidebarId) => {
1418
const { Trigger } = SIDEBARS[sidebarId];
1519
const isActive = sidebarId === currentSidebar;
1620
return (
1721
<div
18-
className={classNames('mt-3', { 'border-primary-700': isActive })}
22+
className={classNames({ 'mt-3': !isMobileView, 'border-primary-700': isActive })}
1923
style={{ borderBottom: isActive ? '2px solid' : null }}
2024
key={sidebarId}
2125
>

src/courseware/course/sidebar/common/TriggerBase.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const SidebarTriggerBase = ({
88
children,
99
}) => (
1010
<button
11-
className="border border-light-400 bg-transparent align-items-center align-content-center d-flex"
11+
className="border border-light-400 bg-transparent align-items-center align-content-center d-flex notification-btn"
1212
type="button"
1313
onClick={onClick}
1414
aria-label={ariaLabel}

src/generic/tabs/useIndexOfLastVisibleChild.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const invisibleStyle = {
66
left: 0,
77
pointerEvents: 'none',
88
visibility: 'hidden',
9+
maxWidth: '100%',
910
};
1011

1112
/**

src/index.scss

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
flex-direction: column;
7171
flex-grow: 1;
7272
margin-bottom: 4rem;
73-
width: 100%;
7473
margin-right: auto;
7574
margin-left: auto;
7675
}
@@ -82,8 +81,24 @@
8281
}
8382
}
8483

84+
.sequence-navigation-container {
85+
display: flex;
86+
align-items: flex-start;
87+
}
88+
89+
.notification-btn {
90+
@media (max-width: -1 + map-get($grid-breakpoints, "sm")) {
91+
height: 3rem;
92+
}
93+
}
94+
8595
.sequence-navigation {
8696
display: flex;
97+
flex-grow: 1;
98+
99+
@media (max-width: -1 + map-get($grid-breakpoints, "sm")) {
100+
max-width: 100%;
101+
}
87102

88103
@media (min-width: map-get($grid-breakpoints, "sm")) {
89104
margin: -1px -1px 0;
@@ -151,9 +166,10 @@
151166
}
152167

153168
.sequence-navigation-tabs {
169+
overflow: auto;
154170
.btn {
155171
flex-basis: 100%;
156-
min-width: 2rem;
172+
min-width: 3rem;
157173
}
158174
}
159175

0 commit comments

Comments
 (0)