diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html index 1cc40e3d6..17b256dea 100644 --- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html +++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html @@ -34,8 +34,8 @@ contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"> - - + + @@ -43,12 +43,12 @@ - + - diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts index 10150ae14..a74ee7819 100644 --- a/src/addons/mod/folder/components/index/index.ts +++ b/src/addons/mod/folder/components/index/index.ts @@ -42,6 +42,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo component = AddonModFolderProvider.COMPONENT; canGetFolder = false; + contents?: AddonModFolderFolderFormattedData; constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) { super('AddonModFolderIndexComponent', courseContentsPage); @@ -57,6 +58,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo if (this.subfolder) { this.description = this.folderInstance ? this.folderInstance.intro : this.module.description; + this.contents = this.subfolder; this.loaded = true; this.refreshIcon = CoreConstants.ICON_REFRESH; @@ -112,7 +114,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo this.dataRetrieved.emit(this.folderInstance || this.module); this.description = this.folderInstance ? this.folderInstance.intro : this.module.description; - this.subfolder = AddonModFolderHelper.formatContents(this.module.contents); + this.contents = AddonModFolderHelper.formatContents(this.module.contents); } finally { this.fillContextMenu(refresh); } diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss index 395112a76..454c740d9 100644 --- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss +++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss @@ -65,7 +65,7 @@ overflow-x: hidden; overflow-y: auto; cursor: text; - img { + ::ng-deep img { @include padding(null, null, null, 2px); max-width: 95%; width: auto; @@ -78,7 +78,7 @@ } // Make empty elements selectable (to move the cursor). - *:empty:after { + ::ng-deep *:empty:after { content: '\200B'; } }