diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html index e2a2a4079..82446c6ad 100644 --- a/src/addons/mod/feedback/pages/form/form.html +++ b/src/addons/mod/feedback/pages/form/form.html @@ -12,9 +12,9 @@ - + - +

{{ 'addon.mod_feedback.mode' | translate }}

@@ -110,7 +110,7 @@
- + diff --git a/src/addons/mod/quiz/pages/player/player.html b/src/addons/mod/quiz/pages/player/player.html index 089a3ecf9..94d0aa3be 100644 --- a/src/addons/mod/quiz/pages/player/player.html +++ b/src/addons/mod/quiz/pages/player/player.html @@ -31,7 +31,7 @@ - + {{ 'addon.mod_quiz.startattempt' | translate }} @@ -67,7 +67,7 @@ - + diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss index bd77cefd5..a843495ec 100644 --- a/src/core/components/loading/loading.scss +++ b/src/core/components/loading/loading.scss @@ -75,6 +75,12 @@ height: 100%; } + &.has-spacer .core-loading-content { + min-height: 100%; + display: flex; + flex-direction: column; + } + &.safe-area-padding:not(.core-loading-inline) .core-loading-content, &.safe-area-padding-horizontal:not(.core-loading-inline) .core-loading-content { @include safe-area-padding-horizontal(0px, 0px); diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html index f8b7bd52f..92a7d5562 100644 --- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html +++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html @@ -1,22 +1,25 @@ - - - +
+ + + + +

{{ 'core.uhoh' | translate }} + {{ 'core.course.activitydisabled' | translate }} + + {{ 'core.course.activitynotyetviewableremoteaddon' | translate }} + +

+
+
+
+
+ -

{{ 'core.uhoh' | translate }} - {{ 'core.course.activitydisabled' | translate }} - - {{ 'core.course.activitynotyetviewableremoteaddon' | translate }} - -

+

{{ 'core.course.useactivityonbrowser' | translate }}

+ + {{ 'core.openinbrowser' | translate }} + +
- - - -

{{ 'core.course.useactivityonbrowser' | translate }}

- - {{ 'core.openinbrowser' | translate }} - - -
-
+
diff --git a/src/core/features/course/components/unsupported-module/unsupported-module.scss b/src/core/features/course/components/unsupported-module/unsupported-module.scss new file mode 100644 index 000000000..b7ca8fa44 --- /dev/null +++ b/src/core/features/course/components/unsupported-module/unsupported-module.scss @@ -0,0 +1,3 @@ +:host { + display: contents; +} diff --git a/src/core/features/course/components/unsupported-module/unsupported-module.ts b/src/core/features/course/components/unsupported-module/unsupported-module.ts index 15c3e7902..ab4892af8 100644 --- a/src/core/features/course/components/unsupported-module/unsupported-module.ts +++ b/src/core/features/course/components/unsupported-module/unsupported-module.ts @@ -23,6 +23,7 @@ import { CoreCourseModuleDelegate } from '@features/course/services/module-deleg @Component({ selector: 'core-course-unsupported-module', templateUrl: 'core-course-unsupported-module.html', + styleUrls: ['unsupported-module.scss'], }) export class CoreCourseUnsupportedModuleComponent implements OnInit { diff --git a/src/core/features/course/pages/module-preview/module-preview.html b/src/core/features/course/pages/module-preview/module-preview.html index 60efcbee6..cd47cd96d 100644 --- a/src/core/features/course/pages/module-preview/module-preview.html +++ b/src/core/features/course/pages/module-preview/module-preview.html @@ -22,7 +22,7 @@ - +
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 58b86f8a2..a48641aba 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -1581,3 +1581,18 @@ body.core-iframe-fullscreen ion-content { } + +.has-spacer { + display: flex; + flex-direction: column; + min-height: 100%; + flex-grow: 1; + + .spacer-top { + flex-grow: 1; + align-content: flex-end; + } + .spacer { + flex-grow: 1; + } +}