EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3067 from crazyserver/MOBILE-3881 

MOBILE-3881 timeline: Wrap overdue status
main
Dani Palou 2022-01-24 08:18:20 +01:00 committed by GitHub
parent c3cc36477f 22d30e7a07
commit 8a386defc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/addons/block/timeline/components/events/addon-block-timeline-events.html
View File

@ -26,10 +26,12 @@
</core-mod-icon> </core-mod-icon>
</ion-col> </ion-col>
<ion-col class="addon-block-timeline-activity-name ion-no-padding"> <ion-col class="addon-block-timeline-activity-name ion-no-padding">
<p class="item-heading"> <p class="item-heading addon-block-timeline-activity-name-with-status">
<core-format-text [text]="event.activityname || event.name" contextLevel="module" <span>
[contextInstanceId]="event.id" [courseId]="event.course && event.course.id"> <core-format-text [text]="event.activityname || event.name" contextLevel="module"
</core-format-text> [contextInstanceId]="event.id" [courseId]="event.course && event.course.id">
</core-format-text>
</span>
<ion-badge *ngIf="event.overdue" color="danger">{{ 'addon.block_timeline.overdue' | translate }} <ion-badge *ngIf="event.overdue" color="danger">{{ 'addon.block_timeline.overdue' | translate }}
</ion-badge> </ion-badge>
</p> </p>

9
src/addons/block/timeline/components/events/events.scss
View File

@ -31,6 +31,15 @@ h4.core-bold {
justify-content: flex-end; justify-content: flex-end;
} }
.addon-block-timeline-activity-name-with-status {
display: flex;
flex-wrap: wrap;
span {
overflow: hidden;
text-overflow: ellipsis;
}
}
.addon-block-timeline-activity-course-activity { .addon-block-timeline-activity-course-activity {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

2
src/core/components/mod-icon/mod-icon.scss
View File

@ -31,6 +31,8 @@ img {
height: var(--size); height: var(--size);
max-width: var(--size); max-width: var(--size);
max-height: var(--size); max-height: var(--size);
min-width: var(--size);
min-height: var(--size);
vertical-align: top; vertical-align: top;
&[alt] { &[alt] {