Merge pull request #2860 from crazyserver/MOBILE-3320

Mobile 3320
main
Noel De Martin 2021-07-01 14:46:25 +02:00 committed by GitHub
commit 31d4f6d464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions

View File

@ -15,7 +15,7 @@
import { Injectable } from '@angular/core';
import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
import { AddonModForum, AddonModForumData, AddonModForumPost, AddonModForumProvider } from '../forum';
import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
import { CoreSitesReadingStrategy } from '@services/sites';
import { CoreFilepool } from '@services/filepool';
import { CoreWSFile } from '@services/ws';
import { CoreCourse, CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } from '@features/course/services/course';
@ -71,15 +71,15 @@ export class AddonModForumPrefetchHandlerService extends CoreCourseActivityPrefe
*/
protected getPostsFiles(posts: AddonModForumPost[]): CoreWSFile[] {
let files: CoreWSFile[] = [];
const getInlineFiles = CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.2');
posts.forEach((post) => {
if (post.attachments && post.attachments.length) {
files = files.concat(post.attachments as CoreWSFile[]);
}
if (getInlineFiles && post.messageinlinefiles && post.messageinlinefiles.length) {
if (post.messageinlinefiles) {
files = files.concat(post.messageinlinefiles);
} else if (post.message && !getInlineFiles) {
} else if (post.message) {
files = files.concat(CoreFilepool.extractDownloadableFilesFromHtmlAsFakeFileObjects(post.message));
}
});

View File

@ -565,12 +565,12 @@ ion-toolbar h1 .core-bar-button-image img {
// Action sheet.
.md ion-action-sheet {
.action-sheet-group-cancel {
-webkit-filter: drop-shadow(0px 3px 3px rgba(var(--action-sheet-shadow-color)));
filter: drop-shadow(0px 3px 3px rgba(var(--action-sheet-shadow-color)));
-webkit-filter: drop-shadow(0px 3px 6px rgba(var(--drop-shadow)));
filter: drop-shadow(0px 3px 6px rgba(var(--drop-shadow)));
}
.action-sheet-title {
border-bottom: 1px solid var(--title-border-color);
border-bottom: 2px solid var(--title-border-color);
}
}
@ -578,6 +578,10 @@ ion-toolbar h1 .core-bar-button-image img {
.action-sheet-title {
font-size: 16px;
}
.action-sheet-title {
border-bottom: 2px solid var(--title-border-color);
}
}
// Radio.

View File

@ -146,10 +146,11 @@
ion-action-sheet {
--button-color: var(--ion-text-color);
--button-color-selected: var(--ion-text-color);
--title-border-color: var(--gray);
--title-border-color: var(--brand-color);
.action-sheet-title {
--color: var(--ion-text-color);
font-weight: bold;
}
@media (min-height: 500px) {