From 9ae7d47f041f87b1a62208787eb74c6d2228f3a8 Mon Sep 17 00:00:00 2001 From: Eric Handtke Date: Thu, 3 Nov 2022 16:12:36 +0100 Subject: [PATCH] fixed old demos --- .../components/ChileDrawer.bbj | 1 + framework/PortalFrame/PortalFrame.bbj | 2 +- widgets/Drawer/Drawer.css | 7 ++- .../components/DrawerFooter/DrawerFooter.css | 1 + .../components/DrawerHeader/DrawerHeader.css | 1 + .../AlternativeDrawerMenuTile.css | 46 +++++++++++++++++-- .../DrawerMenuTile/DrawerMenuTile.css | 20 ++------ 7 files changed, 53 insertions(+), 25 deletions(-) diff --git a/demo/ChileCompanyCustomerPortal/components/ChileDrawer.bbj b/demo/ChileCompanyCustomerPortal/components/ChileDrawer.bbj index d0392875..4b796522 100644 --- a/demo/ChileCompanyCustomerPortal/components/ChileDrawer.bbj +++ b/demo/ChileCompanyCustomerPortal/components/ChileDrawer.bbj @@ -31,6 +31,7 @@ class public ChileDrawer extends Drawer #searchOverlay!.setTitleFieldname("TITLE") #searchOverlay!.setSubtitleFieldname("SUBTITLE") #searchOverlay!.setImagePathFieldname("IMAGE") + #searchOverlay!.setStyle("background","black") #searchOverlay!.setInitialSuggestion(#demoData!) searchWidget! = new DrawerSearchWidget(customContainer!,#searchOverlay!) diff --git a/framework/PortalFrame/PortalFrame.bbj b/framework/PortalFrame/PortalFrame.bbj index 9f878698..2902871d 100644 --- a/framework/PortalFrame/PortalFrame.bbj +++ b/framework/PortalFrame/PortalFrame.bbj @@ -65,7 +65,7 @@ class public PortalFrame implements RouterProtocol field public BBjString LogoUrl! field public BBjString LogoSmallUrl! - field public boolean ShowHeaderIcon! = Boolean.FALSE + field public boolean ShowHeaderIcon! = Boolean.TRUE field public static BBjString ON_NAVIGATION$ = "navigation" diff --git a/widgets/Drawer/Drawer.css b/widgets/Drawer/Drawer.css index 81e84f94..b3088f44 100644 --- a/widgets/Drawer/Drawer.css +++ b/widgets/Drawer/Drawer.css @@ -46,8 +46,6 @@ } .drawerPanelStyle { - display: flex; - flex-direction: column; background-color: var(--drawer-color); margin-top: 0px; position: fixed !important; @@ -141,12 +139,13 @@ overflow: auto !important; height: 100%; max-height: calc(100vh - var(--drawerFooter-height)); - flex: 2; - cursor: pointer; } .drawerFooterWrapper { + position: fixed; background: var(--drawer-color); + bottom: 0; + left: 0; width: inherit; display: grid; display: grid; diff --git a/widgets/Drawer/components/DrawerFooter/DrawerFooter.css b/widgets/Drawer/components/DrawerFooter/DrawerFooter.css index f858d48b..8000cb22 100644 --- a/widgets/Drawer/components/DrawerFooter/DrawerFooter.css +++ b/widgets/Drawer/components/DrawerFooter/DrawerFooter.css @@ -125,6 +125,7 @@ .drawerFooterOverlayContentWrapper { cursor: pointer; + display: grid; } .drawerFooterOverlayContentWrapper div.BBjSimpleWindow:last-child {} diff --git a/widgets/Drawer/components/DrawerHeader/DrawerHeader.css b/widgets/Drawer/components/DrawerHeader/DrawerHeader.css index 740ec886..acacec66 100644 --- a/widgets/Drawer/components/DrawerHeader/DrawerHeader.css +++ b/widgets/Drawer/components/DrawerHeader/DrawerHeader.css @@ -34,6 +34,7 @@ overflow: auto !important; padding: 0px; max-height: 140px; + display: grid; } .drawerHeaderLogo { diff --git a/widgets/Drawer/components/DrawerMenuTile/AlternativeDrawerMenuTile.css b/widgets/Drawer/components/DrawerMenuTile/AlternativeDrawerMenuTile.css index 24c105ba..df795150 100644 --- a/widgets/Drawer/components/DrawerMenuTile/AlternativeDrawerMenuTile.css +++ b/widgets/Drawer/components/DrawerMenuTile/AlternativeDrawerMenuTile.css @@ -25,6 +25,7 @@ padding-left: 5px; background: var(--bbj-window-background); } + .trailingIcon { display: flex; flex-direction: row; @@ -32,14 +33,49 @@ align-items: center; width: 50px; height: 30px; - border-radius: 8px; margin-right: 5px; - } + +.drawerMenuTilePanelStyle { + display: grid; + grid-template-columns: 64px auto; +} + +.drawerMenuTileIconStyle { + width: 24px; + height: 24px; + grid-row-start: 1; + grid-column-start: 1; + justify-self: end; + align-self: center; +} + +.drawerMenuTilePanelStyle:hover { + background-color: var(--menutile-hover-color); +} + +div.drawerMenuTilePanelStyle:hover { + border-right: medium solid var(--menutile-hover-border-color); +} + +.drawerMenuTilePanelStyle { + cursor: pointer; +} + +.drawerMenuTileTextStyle { + padding-left: 17px; + align-self: center; + font-style: normal; + color: var(--tiles-font-color); + font-weight: normal; + font-size: 14px; + padding-bottom: .2em; + line-height: 17px; +} + @media (hover: hover) { - .menutile:hover .trailingIcon{ + .menutile:hover .trailingIcon { display: block; } -} - +} \ No newline at end of file diff --git a/widgets/Drawer/components/DrawerMenuTile/DrawerMenuTile.css b/widgets/Drawer/components/DrawerMenuTile/DrawerMenuTile.css index 822c6a33..174798b0 100644 --- a/widgets/Drawer/components/DrawerMenuTile/DrawerMenuTile.css +++ b/widgets/Drawer/components/DrawerMenuTile/DrawerMenuTile.css @@ -87,30 +87,20 @@ grid-column-start: 1; justify-self: end; align-self: center; - -} - -.drawerMenuTilePanelStyle:hover{ - background-color: var(--menutile-hover-color); -} - -div.drawerMenuTilePanelStyle:hover{ - border-right: medium solid var(--menutile-hover-border-color); -} - -.drawerMenuTilePanelStyle{ - cursor: pointer; } .drawerMenuTileTextStyle { padding-left: 17px; align-self: center; font-style: normal; - color: var(--tiles-font-color); font-weight: normal; font-size: 14px; - padding-bottom: .2em; line-height: 17px; + cursor: pointer; +} + +.drawerMenuTilePanelStyle { + cursor: pointer; } .drawerOpen .menuWndAnimationOpen {