From 4223e5cdb4702c8596c9163627c33198017e6114 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 29 May 2024 10:53:00 -0600 Subject: [PATCH] Framework WIP: - Get nextmatch scrolling --- kdots/assets/styles/framework.less | 33 ++++++++++++++++++++---------- kdots/js/EgwFrameworkApp.styles.ts | 5 ++++- kdots/js/EgwFrameworkApp.ts | 5 +++-- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/kdots/assets/styles/framework.less b/kdots/assets/styles/framework.less index f6812ce726..921d342e43 100644 --- a/kdots/assets/styles/framework.less +++ b/kdots/assets/styles/framework.less @@ -13,7 +13,8 @@ egw-framework#egw_fw_basecontainer { /* Internals */ &::part(status-split) { - --max: 150px; + /* This limits the max size of the status panel */ + --max: 32px; } &::part(header) { @@ -73,14 +74,6 @@ egw-framework#egw_fw_basecontainer { } } -egw-app { - &::part(name) { - display: flex; - align-items: center; - text-wrap: nowrap; - } -} - /*** HEADER ***/ #egw_fw_topmenu_info_items { display: flex; @@ -168,6 +161,24 @@ egw-app { /*** END HEADER ***/ -div#egw_fw_basecontainer { - display: none; +/*** APPLICATION ***/ +egw-app { + &::part(name) { + display: flex; + align-items: center; + text-wrap: nowrap; + } + + &::part(content) { + flex-direction: column; + } +} + +/*** END APPLICATION ***/ + +/*** WIDGETS ***/ +/* This should mostly go away with webcomponents */ +.egwGridView_scrollarea { + overflow-x: hidden; + overflow-y: auto; } \ No newline at end of file diff --git a/kdots/js/EgwFrameworkApp.styles.ts b/kdots/js/EgwFrameworkApp.styles.ts index 01c3e4ef8a..dc524e6cf1 100644 --- a/kdots/js/EgwFrameworkApp.styles.ts +++ b/kdots/js/EgwFrameworkApp.styles.ts @@ -149,11 +149,14 @@ export default css` overflow-y: auto; } - egw_fw_app__main_content { + .egw_fw_app__main_content { display: flex; + flex-direction: column; + align-items: stretch; } ::slotted(*) { + flex: 1 1 auto; } ::slotted(iframe) { diff --git a/kdots/js/EgwFrameworkApp.ts b/kdots/js/EgwFrameworkApp.ts index 0e519205ab..906cb978ef 100644 --- a/kdots/js/EgwFrameworkApp.ts +++ b/kdots/js/EgwFrameworkApp.ts @@ -94,7 +94,7 @@ export class EgwFrameworkApp extends LitElement name = "Application name"; @property() - title : string = "Application title"; + title : string = ""; @property() url = ""; @@ -161,6 +161,7 @@ export class EgwFrameworkApp extends LitElement firstUpdated() { + this.load(this.url); } @@ -573,7 +574,7 @@ export class EgwFrameworkApp extends LitElement >` : nothing } -

${this.title ?? this.egw?.lang(this.name) ?? this.name}

+

${this.title || this.egw?.lang(this.name) || this.name}

${this.name} main-header