From ea8664f8ba93366b8cd67062e8ae8e5f52de9208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 22 Mar 2022 17:22:14 +0100 Subject: [PATCH 1/5] MOBILE-3833 dom: Move onWindowResize to CoreDom --- .../ddimageortext/classes/ddimageortext.ts | 3 +- src/addons/qtype/ddmarker/classes/ddmarker.ts | 2 +- src/addons/qtype/ddwtos/classes/ddwtos.ts | 3 +- src/core/classes/tabs.ts | 4 +-- src/core/directives/collapsible-footer.ts | 3 +- src/core/directives/collapsible-header.ts | 4 +-- src/core/directives/collapsible-item.ts | 3 +- .../rich-text-editor/rich-text-editor.ts | 2 +- src/core/features/mainmenu/pages/menu/menu.ts | 4 +-- src/core/features/mainmenu/pages/more/more.ts | 4 +-- src/core/services/utils/dom.ts | 31 ++----------------- src/core/singletons/dom.ts | 27 ++++++++++++++++ 12 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts index 3adb8a067..c13ce8ddc 100644 --- a/src/addons/qtype/ddimageortext/classes/ddimageortext.ts +++ b/src/addons/qtype/ddimageortext/classes/ddimageortext.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; import { CoreDom } from '@singletons/dom'; import { CoreEventObserver } from '@singletons/events'; @@ -365,7 +364,7 @@ export class AddonQtypeDdImageOrTextQuestion { this.pollForImageLoad(); }); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.repositionDragsForQuestion(); }); } diff --git a/src/addons/qtype/ddmarker/classes/ddmarker.ts b/src/addons/qtype/ddmarker/classes/ddmarker.ts index a1c79281f..667a744d7 100644 --- a/src/addons/qtype/ddmarker/classes/ddmarker.ts +++ b/src/addons/qtype/ddmarker/classes/ddmarker.ts @@ -619,7 +619,7 @@ export class AddonQtypeDdMarkerQuestion { this.pollForImageLoad(); }); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.redrawDragsAndDrops(); }); } diff --git a/src/addons/qtype/ddwtos/classes/ddwtos.ts b/src/addons/qtype/ddwtos/classes/ddwtos.ts index 7366d4d84..8c04a3505 100644 --- a/src/addons/qtype/ddwtos/classes/ddwtos.ts +++ b/src/addons/qtype/ddwtos/classes/ddwtos.ts @@ -13,7 +13,6 @@ // limitations under the License. import { CoreFormatTextDirective } from '@directives/format-text'; -import { CoreDomUtils } from '@services/utils/dom'; import { CoreTextUtils } from '@services/utils/text'; import { CoreUtils } from '@services/utils/utils'; import { CoreComponentsRegistry } from '@singletons/components-registry'; @@ -208,7 +207,7 @@ export class AddonQtypeDdwtosQuestion { this.positionDragItems(); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.positionDragItems(); }); } diff --git a/src/core/classes/tabs.ts b/src/core/classes/tabs.ts index a535e831b..fbb1d0f52 100644 --- a/src/core/classes/tabs.ts +++ b/src/core/classes/tabs.ts @@ -33,7 +33,7 @@ import { Platform, Translate } from '@singletons'; import { CoreSettingsHelper } from '@features/settings/services/settings-helper'; import { CoreAriaRoleTab, CoreAriaRoleTabFindable } from './aria-role-tab'; import { CoreEventObserver } from '@singletons/events'; -import { CoreDomUtils } from '@services/utils/dom'; +import { CoreDom } from '@singletons/dom'; /** * Class to abstract some common code for tabs. @@ -135,7 +135,7 @@ export class CoreTabsBaseComponent implements OnInit, Aft await this.initializeTabs(); } - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.windowResized(); }); } diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts index 73e9dbd5a..f345a9b70 100644 --- a/src/core/directives/collapsible-footer.ts +++ b/src/core/directives/collapsible-footer.ts @@ -21,7 +21,6 @@ import { CoreComponentsRegistry } from '@singletons/components-registry'; import { CoreFormatTextDirective } from './format-text'; import { CoreEventObserver } from '@singletons/events'; import { CoreLoadingComponent } from '@components/loading/loading'; -import { CoreDomUtils } from '@services/utils/dom'; import { CoreCancellablePromise } from '@classes/cancellable-promise'; import { CoreDom } from '@singletons/dom'; @@ -154,7 +153,7 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy { } }); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.calculateHeight(); }, 50); } diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts index 0bf4d0738..fb15f6445 100644 --- a/src/core/directives/collapsible-header.ts +++ b/src/core/directives/collapsible-header.ts @@ -18,9 +18,9 @@ import { CoreLoadingComponent } from '@components/loading/loading'; import { CoreTabsOutletComponent } from '@components/tabs-outlet/tabs-outlet'; import { CoreSettingsHelper } from '@features/settings/services/settings-helper'; import { ScrollDetail } from '@ionic/core'; -import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; import { CoreComponentsRegistry } from '@singletons/components-registry'; +import { CoreDom } from '@singletons/dom'; import { CoreEventObserver } from '@singletons/events'; import { CoreMath } from '@singletons/math'; import { Subscription } from 'rxjs'; @@ -156,7 +156,7 @@ export class CoreCollapsibleHeaderDirective implements OnInit, OnChanges, OnDest this.enteredPromise.reject(new Error('[collapsible-header] Waiting for ionViewDidEnter timeout reached')); }, 5000); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.initializeFloatingTitle(); }, 50); diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts index f0839d8eb..5084f128a 100644 --- a/src/core/directives/collapsible-item.ts +++ b/src/core/directives/collapsible-item.ts @@ -15,7 +15,6 @@ import { Directive, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; import { CoreCancellablePromise } from '@classes/cancellable-promise'; import { CoreLoadingComponent } from '@components/loading/loading'; -import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; import { Translate } from '@singletons'; import { CoreComponentsRegistry } from '@singletons/components-registry'; @@ -90,7 +89,7 @@ export class CoreCollapsibleItemDirective implements OnInit, OnDestroy { await this.calculateHeight(); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.calculateHeight(); }, 50); } diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts index 479933d77..ab00db484 100644 --- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts +++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.ts @@ -254,7 +254,7 @@ export class CoreEditorRichTextEditorComponent implements OnInit, AfterViewInit, ); }); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.windowResized(); }, 50); diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts index 47275c179..0ff66fa97 100644 --- a/src/core/features/mainmenu/pages/menu/menu.ts +++ b/src/core/features/mainmenu/pages/menu/menu.ts @@ -29,7 +29,7 @@ import { filter } from 'rxjs/operators'; import { NavigationEnd } from '@angular/router'; import { trigger, state, style, transition, animate } from '@angular/animations'; import { CoreSites } from '@services/sites'; -import { CoreDomUtils } from '@services/utils/dom'; +import { CoreDom } from '@singletons/dom'; /** * Page that displays the main menu of the app. @@ -122,7 +122,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy { } }); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.initHandlers(); }); document.addEventListener('ionBackButton', this.backButtonFunction); diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts index d3e91ebfa..275686ba2 100644 --- a/src/core/features/mainmenu/pages/more/more.ts +++ b/src/core/features/mainmenu/pages/more/more.ts @@ -26,7 +26,7 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl import { CoreTextUtils } from '@services/utils/text'; import { Translate } from '@singletons'; import { CoreMainMenuDeepLinkManager } from '@features/mainmenu/classes/deep-link-manager'; -import { CoreDomUtils } from '@services/utils/dom'; +import { CoreDom } from '@singletons/dom'; /** * Page that displays the more page of the app. @@ -73,7 +73,7 @@ export class CoreMainMenuMorePage implements OnInit, OnDestroy { this.initHandlers(); }); - this.resizeListener = CoreDomUtils.onWindowResize(() => { + this.resizeListener = CoreDom.onWindowResize(() => { this.initHandlers(); }); diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts index 9d2bc991a..c0268ba1f 100644 --- a/src/core/services/utils/dom.ts +++ b/src/core/services/utils/dom.ts @@ -53,7 +53,6 @@ import { NavigationStart } from '@angular/router'; import { filter } from 'rxjs/operators'; import { Subscription } from 'rxjs'; import { CoreComponentsRegistry } from '@singletons/components-registry'; -import { CoreEventObserver } from '@singletons/events'; import { CoreDom } from '@singletons/dom'; /* @@ -93,30 +92,6 @@ export class CoreDomUtilsProvider { this.debugDisplay = debugDisplay != 0; } - /** - * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much. - * This function helps setting up the debounce feature and remove listener easily. - * - * @param resizeFunction Function to execute on resize. - * @param debounceDelay Debounce time in ms. - * @return Event observer to call off when finished. - */ - onWindowResize(resizeFunction: (ev?: Event) => void, debounceDelay = 20): CoreEventObserver { - const resizeListener = CoreUtils.debounce(async (ev?: Event) => { - await this.waitForResizeDone(); - - resizeFunction(ev); - }, debounceDelay); - - window.addEventListener('resize', resizeListener); - - return { - off: (): void => { - window.removeEventListener('resize', resizeListener); - }, - }; - } - /** * Equivalent to element.closest(). If the browser doesn't support element.closest, it will * traverse the parents to achieve the same functionality. @@ -1902,7 +1877,7 @@ export class CoreDomUtilsProvider { /** * Trigger form cancelled event. * - * @param form Form element. + * @param formRef Form element. * @param siteId The site affected. If not provided, no site affected. * @deprecated since 3.9.5. Function has been moved to CoreForms. */ @@ -1913,7 +1888,7 @@ export class CoreDomUtilsProvider { /** * Trigger form submitted event. * - * @param form Form element. + * @param formRef Form element. * @param online Whether the action was done in offline or not. * @param siteId The site affected. If not provided, no site affected. * @deprecated since 3.9.5. Function has been moved to CoreForms. @@ -1924,7 +1899,7 @@ export class CoreDomUtilsProvider { /** * In iOS the resize event is triggered before the window size changes. Wait for the size to change. - * Use of this function is discouraged. Please use onWindowResize to check window resize event. + * Use of this function is discouraged. Please use CoreDom.onWindowResize to check window resize event. * * @param windowWidth Initial window width. * @param windowHeight Initial window height. diff --git a/src/core/singletons/dom.ts b/src/core/singletons/dom.ts index fdd0dd9d0..d26b1834e 100644 --- a/src/core/singletons/dom.ts +++ b/src/core/singletons/dom.ts @@ -13,6 +13,9 @@ // limitations under the License. import { CoreCancellablePromise } from '@classes/cancellable-promise'; +import { CoreDomUtils } from '@services/utils/dom'; +import { CoreUtils } from '@services/utils/utils'; +import { CoreEventObserver } from '@singletons/events'; /** * Singleton with helper functions for dom. @@ -147,6 +150,30 @@ export class CoreDom { slot.addEventListener('slotchange', slotListener);; } + /** + * Window resize is widely checked and may have many performance issues, debouce usage is needed to avoid calling it too much. + * This function helps setting up the debounce feature and remove listener easily. + * + * @param resizeFunction Function to execute on resize. + * @param debounceDelay Debounce time in ms. + * @return Event observer to call off when finished. + */ + static onWindowResize(resizeFunction: (ev?: Event) => void, debounceDelay = 20): CoreEventObserver { + const resizeListener = CoreUtils.debounce(async (ev?: Event) => { + await CoreDomUtils.waitForResizeDone(); + + resizeFunction(ev); + }, debounceDelay); + + window.addEventListener('resize', resizeListener); + + return { + off: (): void => { + window.removeEventListener('resize', resizeListener); + }, + }; + } + /** * Scroll to a certain element. * From cd660513d93aadd5bd6852f049846a6054a9181a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 23 Mar 2022 16:33:00 +0100 Subject: [PATCH 2/5] MOBILE-3833 styles: Adapt button color to toolbar --- src/theme/components/collapsible-header.scss | 2 ++ src/theme/theme.base.scss | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/theme/components/collapsible-header.scss b/src/theme/components/collapsible-header.scss index ff7282027..04304a443 100644 --- a/src/theme/components/collapsible-header.scss +++ b/src/theme/components/collapsible-header.scss @@ -29,6 +29,8 @@ --core-header-toolbar-border-width: 0; ion-toolbar { --background: transparent; + --core-header-buttons-background: var(--ion-background-color); + --core-header-buttons-color: var(--text-color); } h1 { diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index b60b71e4e..1c5db24cf 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -152,9 +152,11 @@ ion-toolbar { // Header. ion-header { z-index: 12; // To hide ion-slides on scroll. - --core-header-buttons-background: var(--core-header-toolbar-background); ion-toolbar { + --core-header-buttons-background: var(--core-header-toolbar-background); + --core-header-buttons-color: var(--core-header-toolbar-color); + ion-spinner { margin: 10px; } @@ -164,11 +166,11 @@ ion-header { .in-toolbar.button-solid, .button.button-clear, .button.button-solid { - --color: var(--core-header-toolbar-color); + --color: var(--core-header-buttons-color); --background: var(--core-header-buttons-background); - --ion-toolbar-color: var(--core-header-toolbar-color); + --ion-toolbar-color: var(--core-header-buttons-color); --border-radius: var(--huge-radius); - --primary: var(--core-header-toolbar-color); + --primary: var(--core-header-buttons-color); } ion-back-button::part(text) { display: none; @@ -1490,7 +1492,11 @@ ion-header.no-title { --core-header-toolbar-border-width: 0; --core-header-toolbar-background: transparent; --core-header-shadow: none !important; - --core-header-buttons-background: var(--ion-background-color); + ion-toolbar { + --core-header-buttons-background: var(--ion-background-color); + --core-header-buttons-color: var(--text-color); + } + } // To make core-swipe-slides fill the remaining height. From a3762ef43a3ebedaebd39e729bdfb71456c41587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 23 Mar 2022 16:47:10 +0100 Subject: [PATCH 3/5] MOBILE-3833 database: Fix '>' typos --- .../mod/data/components/index/addon-mod-data-index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html index b9dab9e0e..d8eef7e45 100644 --- a/src/addons/mod/data/components/index/addon-mod-data-index.html +++ b/src/addons/mod/data/components/index/addon-mod-data-index.html @@ -52,7 +52,7 @@ - > + @@ -61,7 +61,7 @@ - > + From ceae6f980deddb9a8020b08307d8e3203158217c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 23 Mar 2022 17:33:20 +0100 Subject: [PATCH 4/5] MOBILE-3833 core: Simplify empty box component --- .../myoverview/addon-block-myoverview.html | 2 +- .../addon-block-recentlyaccessedcourses.html | 2 +- .../addon-block-recentlyaccesseditems.html | 2 +- .../addon-block-starredcourses.html | 2 +- .../events/addon-block-timeline-events.html | 4 +- .../timeline/addon-block-timeline.html | 2 +- src/addons/calendar/pages/day/day.html | 2 +- .../index/addon-mod-wiki-index.html | 2 +- .../components/empty-box/core-empty-box.html | 12 +-- src/core/components/empty-box/empty-box.scss | 89 ++++++------------- src/core/components/empty-box/empty-box.ts | 11 ++- .../components/split-view/split-view.scss | 3 +- src/theme/theme.base.scss | 3 +- 13 files changed, 47 insertions(+), 89 deletions(-) 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%; From c3feb2c3ea14e22c71ae98094ebb9fd320d083fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 24 Mar 2022 11:45:44 +0100 Subject: [PATCH 5/5] MOBILE-3833 travis: Add packages --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2f2fe03c..9b254f518 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,12 +51,18 @@ jobs: apt: packages: - libsecret-1-dev + - php5-cli + - php5-common - stage: build name: "Build iOS" language: node_js if: env(BUILD_IOS) = 1 AND (env(DEPLOY) = 1 OR (env(DEPLOY) = 2 AND tag IS NOT blank)) os: osx - osx_image: xcode12.5 + osx_image: xcode13.1 + addons: + homebrew: + packages: + - jq - stage: test name: "End to end tests (mod_forum and mod_messages)" services: