Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync opencraft-release/quince.1 with Upstream 20250106-1736193456 #57

Open
wants to merge 3 commits into
base: opencraft-release/quince.1
Choose a base branch
from
Open

Sync opencraft-release/quince.1 with Upstream 20250106-1736193456 #57

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbb3ed5
fix: RTL for the upgrade notification list (#1228)
ihor-romaniuk Apr 7, 2024
37c28b6
fix: optimize scroll position observer after video fullscreen exit (#…
ihor-romaniuk Jun 6, 2024
7c1c0d3
fix: iframe height for discussions sidebar (#1392)
ihor-romaniuk Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: iframe height for discussions sidebar (openedx#1392) 
* fix: iframe height for discussions sidebar

* fix: increase adaptation brakepoint
  • Loading branch information
@ihor-romaniuk
ihor-romaniuk authored Aug 8, 2024
commit 7c1c0d3a91f003df167a506a181b6250cfb8f208
5 changes: 5 additions & 0 deletions src/courseware/course/sidebar/sidebars/discussions/Discussions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.discussions-sidebar-frame {
@media (max-width: -1 + map-get($grid-breakpoints, "xl")) {
max-height: calc(100vh - 65px);
}
}
2 changes: 1 addition & 1 deletion src/courseware/course/sidebar/sidebars/discussions/DiscussionsSidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const DiscussionsSidebar = ({ intl }) => {
>
<iframe
src={`${discussionsUrl}?inContextSidebar`}
className="d-flex w-100 h-100 border-0"
className="d-flex w-100 h-100 border-0 discussions-sidebar-frame"
title={intl.formatMessage(messages.discussionsTitle)}
allow="clipboard-write"
loading="lazy"
Expand Down
3 changes: 2 additions & 1 deletion src/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@

// Import component-specific sass files
@import "courseware/course/celebration/CelebrationModal.scss";
@import "courseware/course/sidebar/sidebars/discussions/Discussions.scss";
@import "courseware/course/sidebar/sidebars/notifications/NotificationIcon.scss";
@import "courseware/course/sequence/lock-paywall/LockPaywall.scss";
@import "shared/streak-celebration/StreakCelebrationModal.scss";
Expand All @@ -402,7 +403,7 @@
@import "generic/upgrade-notification/UpgradeNotification.scss";
@import "generic/upsell-bullets/UpsellBullets.scss";
@import "course-home/outline-tab/widgets/ProctoringInfoPanel.scss";
@import "src/course-home/outline-tab/widgets/FlagButton.scss";
@import "course-home/outline-tab/widgets/FlagButton.scss";
@import "course-home/progress-tab/course-completion/CompletionDonutChart.scss";
@import "course-home/progress-tab/grades/course-grade/GradeBar.scss";
@import "courseware/course/course-exit/CourseRecommendations";
Expand Down
Loading