Merge pull request #55 from open-craft/sync-open-release/redwood.mast…

…er-20241209-1733703792 Sync opencraft-release/redwood.1 with Upstream 20241209-1733703792
open-craft · Dec 26, 2024 · ce6b13b · ce6b13b
2 parents 1774b3f + 8356505
commit ce6b13b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/courseware/course/sidebar/sidebars/discussions/Discussions.scss b/src/courseware/course/sidebar/sidebars/discussions/Discussions.scss
@@ -0,0 +1,5 @@
+.discussions-sidebar-frame {
+    @media (max-width: -1 + map-get($grid-breakpoints, "xl")) {
+        max-height: calc(100vh - 65px);
+    }
+}
diff --git a/src/courseware/course/sidebar/sidebars/discussions/DiscussionsSidebar.jsx b/src/courseware/course/sidebar/sidebars/discussions/DiscussionsSidebar.jsx
@@ -38,7 +38,7 @@ const DiscussionsSidebar = ({ intl }) => {
     >
       <iframe
         src={`${discussionsUrl}?inContextSidebar`}
-        className="d-flex sticky-top vh-100 w-100 border-0"
+        className="d-flex sticky-top vh-100 w-100 border-0 discussions-sidebar-frame"
         title={intl.formatMessage(messages.discussionsTitle)}
         allow="clipboard-write"
         loading="lazy"

diff --git a/src/index.scss b/src/index.scss
@@ -432,6 +432,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";