From ba1e2ab6029a961a6b39c6713d4179ca063d1994 Mon Sep 17 00:00:00 2001 From: sua yoo Date: Tue, 6 Aug 2024 17:54:05 -0700 Subject: [PATCH] feat: App bar enhancements (#1996) - Always shows current org name - Moves org dropdown next to logo - Reduces logo size when logged in at smaller screen sizes --- .../assets/brand/browsertrix-lockup-color.svg | 2 +- frontend/src/index.ts | 263 ++++++++++-------- frontend/src/shoelace.ts | 1 + frontend/src/theme.stylesheet.css | 8 + 4 files changed, 159 insertions(+), 115 deletions(-) diff --git a/frontend/src/assets/brand/browsertrix-lockup-color.svg b/frontend/src/assets/brand/browsertrix-lockup-color.svg index 66caac58..4ab0eb83 100644 --- a/frontend/src/assets/brand/browsertrix-lockup-color.svg +++ b/frontend/src/assets/brand/browsertrix-lockup-color.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/frontend/src/index.ts b/frontend/src/index.ts index e37459a5..724e81f8 100644 --- a/frontend/src/index.ts +++ b/frontend/src/index.ts @@ -283,90 +283,113 @@ export class App extends LiteElement { const isSuperAdmin = this.appState.userInfo?.isSuperAdmin; let homeHref = "/"; if (!isSuperAdmin && this.appState.orgSlug) { - homeHref = `/orgs/${this.appState.orgSlug}`; + homeHref = this.orgBasePath; } + const showFullLogo = + this.viewState.route === "login" || !this.authService.authState; + return html`