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

Jump to bottom

Communication: Fix content overflow in expanded thread view #9474

Merged
merged 8 commits into from
Oct 27, 2024
Merged

Communication: Fix content overflow in expanded thread view #9474

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb4f73d
fix card width for thread view
asliayk Oct 13, 2024
38e7597
Merge branch 'develop' into bugfix/communication/fix-expand-thread-view
asliayk Oct 18, 2024
86af4fe
Merge branch 'develop' into bugfix/communication/fix-expand-thread-view
asliayk Oct 19, 2024
2714f53
Merge branch 'develop' into bugfix/communication/fix-expand-thread-view
asliayk Oct 26, 2024
801c1c9
refactor styling
asliayk Oct 26, 2024
1107caf
Merge branch 'develop' into bugfix/communication/fix-expand-thread-view
asliayk Oct 26, 2024
89f2587
refactor styling
asliayk Oct 27, 2024
f44ef63
added test
asliayk Oct 27, 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
5 changes: 1 addition & 4 deletions src/main/webapp/app/overview/course-conversations/course-conversations.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,7 @@
<jhi-course-wide-search (openThread)="postInThread = $event" [courseWideSearchConfig]="courseWideSearchConfig" />
}
</div>
<div
class="communication-answer-message-wrap col flex-grow-1 justify-end px-0 scrollable-content"
[ngClass]="{ 'content-height-dev': !isProduction || isTestServer, 'is-answer-thread-open': !!postInThread }"
>
<div class="scrollable-content" [ngClass]="{ 'content-height-dev': !isProduction || isTestServer, 'is-answer-thread-open': !!postInThread }">
@if (!!postInThread) {
<jhi-conversation-thread-sidebar
[activeConversation]="activeConversation ?? postInThread.conversation!"
Expand Down
6 changes: 1 addition & 5 deletions src/main/webapp/app/overview/course-conversations/course-conversations.component.scss
View file
Open in desktop
asliayk marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
overflow-y: auto;
overflow-x: hidden;
max-height: calc(100vh - var(--header-height) - var(--message-input-height-prod));
flex-wrap: wrap;

&.content-height-dev {
max-height: calc(100vh - var(--header-height) - var(--message-input-height-dev));
Expand All @@ -45,11 +46,6 @@
min-width: 200px;
}

.communication-answer-message-wrap {
max-width: min-content;
display: flex;
}

@include media-breakpoint-down(sm) {
.communication-content-sidebar {
position: absolute;
Expand Down
17 changes: 9 additions & 8 deletions ...nversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,28 @@
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/mixins';

$draggable-width: 15px;
$thread-section-card-min-width: 420px;

.postings-container {
display: flex;
height: 100%;
margin-left: auto;
min-width: 30%;
max-width: 100%;

.back-instruction {
font-size: 12px;
}
}

.expanded-thread {
width: calc(#{$draggable-width} + #{$thread-section-card-min-width});
display: flex;
flex-grow: 1;
min-width: 30%;
max-width: 100%;

.scrollbar {
position: relative;
max-height: 1000px;
overflow: auto;
overflow-x: hidden;
}

.wrapper-scroll-y {
Expand All @@ -34,12 +36,12 @@ $thread-section-card-min-width: 420px;
flex-direction: column;
align-items: center;
justify-content: center;
min-width: $draggable-width;
min-width: 1.5%;
max-width: 1.5%;
}

.card {
width: inherit;
min-width: $thread-section-card-min-width;

.card-header {
justify-content: space-between;
Expand All @@ -62,7 +64,6 @@ $thread-section-card-min-width: 420px;

.collapsed-thread {
display: flex;
width: 38px;
justify-content: space-between;
flex-flow: column;
margin-left: auto;
Expand Down
4 changes: 2 additions & 2 deletions ...conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ export class ConversationThreadSidebarComponent implements AfterViewInit {
modifiers: [
// Set maximum width
interact.modifiers!.restrictSize({
min: { width: 435, height: 0 },
max: { width: 600, height: 4000 },
min: { width: window.innerWidth * 0.3, height: 0 },
max: { width: window.innerWidth, height: 0 },
}),
],
inertia: true,
Expand Down
2 changes: 1 addition & 1 deletion .../posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="d-flex gap-2 fs-xx-small">
<div class="d-flex flex-wrap gap-2 fs-xx-small">
@for (reactionMetaData of reactionMetaDataMap | keyvalue; track reactionMetaData) {
<div>
<button
Expand Down
2 changes: 1 addition & 1 deletion ...p/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="d-flex gap-2 fs-xx-small">
<div class="d-flex flex-wrap gap-2 fs-xx-small">
@if (!isCommunicationPage) {
@if (sortedAnswerPosts.length) {
<!-- collapse answers -->
Expand Down
Loading