From f2f7107148837644a0fbe51e14d9e86cf2720a18 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Tue, 2 Apr 2024 21:29:32 +0000 Subject: [PATCH 1/3] chore: stabilize light theme --- .../src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx b/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx index ae0d15358e0f6..6b34ba19b93f2 100644 --- a/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx +++ b/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx @@ -57,7 +57,6 @@ export const AppearanceForm: FC = ({ /> onChangeTheme("light")} From 80f533babac2afb72e623f058bfd1553cf504a2d Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Tue, 2 Apr 2024 21:32:31 +0000 Subject: [PATCH 2/3] use `ExternalImage` in `Navbar` --- site/src/modules/dashboard/Navbar/NavbarView.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx index 2ad38dcf9fe58..af8146e26a5e7 100644 --- a/site/src/modules/dashboard/Navbar/NavbarView.tsx +++ b/site/src/modules/dashboard/Navbar/NavbarView.tsx @@ -13,6 +13,7 @@ import { type FC, type ReactNode, useRef, useState } from "react"; import { NavLink, useLocation, useNavigate } from "react-router-dom"; import type * as TypesGen from "api/typesGenerated"; import { Abbr } from "components/Abbr/Abbr"; +import { ExternalImage } from "components/ExternalImage/ExternalImage"; import { displayError } from "components/GlobalSnackbar/utils"; import { CoderIcon } from "components/Icons/CoderIcon"; import { Latency } from "components/Latency/Latency"; @@ -150,7 +151,7 @@ export const NavbarView: FC = ({
{logo_url ? ( - Custom Logo + ) : ( )} From cf68c31fe2a7353bce6e59ed34d2971940c5c532 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Tue, 2 Apr 2024 21:54:17 +0000 Subject: [PATCH 3/3] add a story --- site/src/modules/dashboard/Navbar/NavbarView.stories.tsx | 6 ++++++ site/src/modules/dashboard/Navbar/NavbarView.tsx | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx b/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx index fac1f344ce0c4..cf5522c56203a 100644 --- a/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx +++ b/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx @@ -25,3 +25,9 @@ export const ForMember: Story = { canViewAllUsers: false, }, }; + +export const CustomLogo: Story = { + args: { + logo_url: "/icon/github.svg", + }, +}; diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx index af8146e26a5e7..558706eee614a 100644 --- a/site/src/modules/dashboard/Navbar/NavbarView.tsx +++ b/site/src/modules/dashboard/Navbar/NavbarView.tsx @@ -168,7 +168,7 @@ export const NavbarView: FC = ({ {logo_url ? ( - Custom Logo + ) : ( )}