diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html index 753f0fa8c..8131987f4 100644 --- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html +++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html @@ -69,7 +69,7 @@ + [message]="'addon.block_myoverview.nocourses' | translate"> diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html index 6ba01b2f2..93b5c04f7 100644 --- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html +++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html @@ -8,7 +8,7 @@ -
-
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html index 1ff007fce..02398a668 100644 --- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html +++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html @@ -8,7 +8,7 @@ -
{{'addon.block_timeline.noevents' | translate}}

- + + diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html index a4155a94d..b652282e9 100644 --- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html +++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html @@ -66,7 +66,7 @@ - diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html index daf9206dd..67bdbd8b1 100644 --- a/src/addons/calendar/pages/day/day.html +++ b/src/addons/calendar/pages/day/day.html @@ -59,7 +59,7 @@ - diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html index cfe144af2..f4fd30532 100644 --- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html +++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html @@ -60,7 +60,7 @@ - + diff --git a/src/core/components/empty-box/core-empty-box.html b/src/core/components/empty-box/core-empty-box.html index 89f21cb33..34604cea3 100644 --- a/src/core/components/empty-box/core-empty-box.html +++ b/src/core/components/empty-box/core-empty-box.html @@ -1,8 +1,4 @@ -
-
- - -

{{ message }}

- -
-
+ + +

{{ message }}

+ diff --git a/src/core/components/empty-box/empty-box.scss b/src/core/components/empty-box/empty-box.scss index b0b3c2254..812dde4ca 100644 --- a/src/core/components/empty-box/empty-box.scss +++ b/src/core/components/empty-box/empty-box.scss @@ -1,74 +1,35 @@ +@import "~theme/globals"; + :host { - display: contents; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + flex-grow: 1; + color: var(--text-color); + margin: 0 auto; + text-align: center; + padding: 16px; + --image-size: 120px; - .core-empty-box { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - display: table; - height: 100%; - width: 100%; - margin: 0; - clear: both; - pointer-events: none; - - .core-empty-box-content { - margin: 0; - display: table-cell; - text-align: center; - vertical-align: middle; - pointer-events: auto; - } - - &.core-empty-box-inline { - position: relative; - z-index: initial; - top: initial; - right: initial; - bottom: 0; - left: initial; - height: auto; - } - - ion-icon { - font-size: 120px; - } - img { - height: 125px; - width: 145px; - margin: 0 auto; - } - p { - font-size: 120%; - } + ion-icon { + font-size: var(--image-size); + } + img { + height: var(--image-size); + } + p { + font-size: 120%; } - &.core-empty-box-clickable .core-empty-box { + &.core-empty-box-clickable { z-index: 0; } +} - @media (max-height: 550px) { - .core-empty-box { - position: relative; - height: auto; - margin-top: 50px; - - ion-icon { - font-size: 100px; - } - img { - height: 104px; - width: 121px; - } - } - } - - &.core-empty-inline .core-empty-box { - position: relative; - z-index: initial; - height: auto; +@include media-breakpoint-down(sm) { + :host { + --image-size: 100px; } } diff --git a/src/core/components/empty-box/empty-box.ts b/src/core/components/empty-box/empty-box.ts index 3b9cf13f5..efbec5b2d 100644 --- a/src/core/components/empty-box/empty-box.ts +++ b/src/core/components/empty-box/empty-box.ts @@ -32,12 +32,11 @@ export class CoreEmptyBoxComponent { @Input() message = ''; // Message to display. @Input() icon?: string; // Name of the icon to use. @Input() image?: string; // Image source. If an icon is provided, image won't be used. - - /** - * If this has to be shown inline instead of occupying whole page. - * If image or icon is not supplied, it's true by default. - */ - @Input() inline = false; @Input() flipIconRtl = false; // Whether to flip the icon in RTL. Defaults to false. + /** + * @deprecated not used anymore. + */ + @Input() inline = false; + } diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss index 089107563..fa9da2e18 100644 --- a/src/core/components/split-view/split-view.scss +++ b/src/core/components/split-view/split-view.scss @@ -10,7 +10,7 @@ --menu-display: flex; --content-display: block; --content-outlet-display: none; - --content-placeholder-display: var(--content-display); + --content-placeholder-display: flex; top: 0; right: 0; @@ -70,6 +70,7 @@ --menu-min-width: 0px; --menu-max-width: 100%; --content-display: none; + --content-placeholder-display: none; --menu-border-width: 0px; --menu-box-shadow: none; --menu-z: 0px; diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 1c5db24cf..4448600ce 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -1520,7 +1520,8 @@ ion-header.no-title { } -.has-spacer { +.has-spacer, +.core-flex-fill { display: flex; flex-direction: column; min-height: 100%;