diff --git a/apps/extension/src/routes/page/index.tsx b/apps/extension/src/routes/page/index.tsx index 1691479b96..041b004d1f 100644 --- a/apps/extension/src/routes/page/index.tsx +++ b/apps/extension/src/routes/page/index.tsx @@ -1,15 +1,6 @@ import { redirect } from 'react-router-dom'; import { PagePath } from './paths'; -import { - Button, - Card, - CardContent, - CardDescription, - CardHeader, - CardTitle, - CompressedVideoLogo, - FadeTransition, -} from '@penumbra-zone/ui'; +import { Button, SplashPage } from '@penumbra-zone/ui'; import { localExtStorage } from '@penumbra-zone/storage'; // Because Zustand initializes default empty (prior to persisted storage synced), @@ -25,32 +16,20 @@ export const pageIndexLoader = async () => { export const PageIndex = () => { return ( - -
- -
- - - - Successful login - - - Use your account to transact, stake, swap or market make. All of it is shielded and - private. - - - - - - -
+ + + ); }; diff --git a/apps/extension/src/routes/popup/home/index.tsx b/apps/extension/src/routes/popup/home/index.tsx index f491c14e88..e326c2e595 100644 --- a/apps/extension/src/routes/popup/home/index.tsx +++ b/apps/extension/src/routes/popup/home/index.tsx @@ -35,8 +35,7 @@ export const PopupIndex = () => { const getAddrByIndex = useStore(addrByIndexSelector); return ( -
-
+
diff --git a/apps/extension/src/routes/popup/popup-layout.tsx b/apps/extension/src/routes/popup/popup-layout.tsx index 4bc653a3c9..4dee363543 100644 --- a/apps/extension/src/routes/popup/popup-layout.tsx +++ b/apps/extension/src/routes/popup/popup-layout.tsx @@ -1,7 +1,4 @@ -import { Outlet, useLocation } from 'react-router-dom'; -import { cn } from '@penumbra-zone/ui/lib/utils'; -import { PopupPath } from './paths'; -import { useMemo } from 'react'; +import { Outlet } from 'react-router-dom'; /** * @todo: Fix the issue where the detached popup isn't sized correctly. This @@ -14,25 +11,8 @@ import { useMemo } from 'react'; * routes here in `PopupLayout`, and using a different root class name for each, * then removing the hard-coded width from `globals.css`. */ -export const PopupLayout = () => { - const location = useLocation(); - - const isDarkBg = useMemo(() => { - const pathname = location.pathname as PopupPath; - return pathname === PopupPath.INDEX || pathname === PopupPath.LOGIN; - }, [location]); - - return ( -
-
- -
-
-
- ); -}; +export const PopupLayout = () => ( +
+ +
+); diff --git a/packages/tailwind-config/index.js b/packages/tailwind-config/index.js index 9fd49c271b..f44cdb8d7f 100644 --- a/packages/tailwind-config/index.js +++ b/packages/tailwind-config/index.js @@ -146,7 +146,13 @@ export default { 'text-linear': 'linear-gradient(90deg, var(--teal-700), var(--sand-700), var(--rust-600))', 'button-gradient-secondary': 'linear-gradient(90deg, var(--teal-420) 0%, var(--sand-420) 50%, var(--rust-420) 100%)', - logo: "url('penumbra-logo.svg')", + logo: ` + linear-gradient( + color-mix(in srgb, var(--charcoal) 80%, transparent), + color-mix(in srgb, var(--charcoal) 80%, transparent) + ), + url('penumbra-logo.svg') + `, }, backgroundPosition: { 'right-center': 'right center', diff --git a/packages/ui/components/ui/splash-page.tsx b/packages/ui/components/ui/splash-page.tsx index 02e388a52f..2b329c3ee8 100644 --- a/packages/ui/components/ui/splash-page.tsx +++ b/packages/ui/components/ui/splash-page.tsx @@ -1,12 +1,20 @@ import { ReactNode } from 'react'; -import { Card, CardContent, CardHeader, CardTitle } from './card'; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from './card'; import { CompressedVideoLogo } from './logo/compressed-video'; import { FadeTransition } from './fade-transition'; -export const SplashPage = ({ title, children }: { title: string; children: ReactNode }) => { +export const SplashPage = ({ + title, + description, + children, +}: { + title: string; + description?: ReactNode; + children: ReactNode; +}) => { return ( -
+
@@ -15,6 +23,7 @@ export const SplashPage = ({ title, children }: { title: string; children: React {title} + {description && {description}} {children}