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.

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

Communication: Fix padding issues in channel search and post components #9927

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@if (course) {
<div class="py-3 pt-0 justify-content-center conversation-messages">
<div class="justify-content-center">
<div class="row justify-content-center p-0">
<div class="justify-content-center px-3 py-0">
<!-- search bar -->
@if (!searchbarCollapsed) {
<div class="input-group ps-0" [class.search-active]="!!searchText">
Expand Down
16 changes: 8 additions & 8 deletions src/main/webapp/app/shared/metis/post/post.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@
</div>
}
<div class="align-items-center">
<div class="col">
<div>
<div>
<div class="post-context-information-wrap post-content-padding" [ngClass]="{ 'is-saved': isConsecutive() && posting.isSaved }">
@if (showAnnouncementIcon) {
<fa-icon
[icon]="faBullhorn"
iconSize="xs"
class="col-auto pe-0 announcement-icon"
class="pe-0 ms-1 announcement-icon"
[ngbTooltip]="'artemisApp.metis.post.postMarkedAsAnnouncementTooltip' | artemisTranslate"
/>
}
<!-- in the course all-messages as well as in the preview mode during similarity check, the context (lecture, exercise, course-wide topic) is shown -->
<!-- not shown in course messages page -->
@if (showChannelReference && (pageType === PageType.OVERVIEW || previewMode)) {
<span class="col-auto">
<span>
@if (contextInformation.routerLinkComponents) {
<a
class="linked-context-information post-content-padding ms-1"
class="linked-context-information ms-1"
[routerLink]="contextInformation.routerLinkComponents"
[queryParams]="contextInformation.queryParams"
(click)="onNavigateToContext($event)"
Expand All @@ -46,15 +46,15 @@
>
}
@if (!contextInformation.routerLinkComponents) {
<span class="context-information post-content-padding ms-1">{{ contextInformation.displayName }}:</span>
<span class="context-information ms-1">{{ contextInformation.displayName }}:</span>
}
</span>
}
<!-- post title not shown for plagiarism cases -->
@if (pageType !== PageType.PLAGIARISM_CASE_INSTRUCTOR && pageType !== PageType.PLAGIARISM_CASE_STUDENT) {
<span class="col-auto">
<span>
@if (posting.title?.length) {
<span class="post-title post-content-padding ms-1">{{ posting.title }}</span>
<span class="post-title ms-1">{{ posting.title }}</span>
}
</span>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
.post-is-saved-message,
.message-container,
.post-reactions-bar,
.post-context-information-wrap,
.post {
background-color: transparent;

Expand Down
Loading