diff --git a/web/components/manifold-logo.tsx b/web/components/manifold-logo.tsx new file mode 100644 index 00000000..545093e5 --- /dev/null +++ b/web/components/manifold-logo.tsx @@ -0,0 +1,37 @@ +import Link from 'next/link' +import clsx from 'clsx' + +export function ManifoldLogo(props: { darkBackground?: boolean }) { + const { darkBackground } = props + + return ( + + + +
+ Manifold +
+ Markets +
+
+ Manifold Markets +
+
+ + ) +} diff --git a/web/components/mantic-logo.tsx b/web/components/mantic-logo.tsx deleted file mode 100644 index 070838dc..00000000 --- a/web/components/mantic-logo.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import Link from 'next/link' -import clsx from 'clsx' - -export function ManticLogo(props: { darkBackground?: boolean }) { - const { darkBackground } = props - return ( - - - -
- Manifold Markets -
-
- - ) -} diff --git a/web/components/nav-bar.tsx b/web/components/nav-bar.tsx index f5e0a721..cf2a20d3 100644 --- a/web/components/nav-bar.tsx +++ b/web/components/nav-bar.tsx @@ -4,16 +4,17 @@ import Link from 'next/link' import { useUser } from '../hooks/use-user' import { Row } from './layout/row' import { firebaseLogin, User } from '../lib/firebase/users' -import { ManticLogo } from './mantic-logo' +import { ManifoldLogo } from './manifold-logo' import { ProfileMenu } from './profile-menu' export function NavBar(props: { darkBackground?: boolean wide?: boolean + isLandingPage?: boolean className?: string children?: any }) { - const { darkBackground, wide, className, children } = props + const { darkBackground, wide, isLandingPage, className, children } = props const user = useUser() @@ -26,10 +27,10 @@ export function NavBar(props: { - + {children} diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx index 97c73ffa..d6c54e47 100644 --- a/web/components/profile-menu.tsx +++ b/web/components/profile-menu.tsx @@ -1,7 +1,7 @@ import Image from 'next/image' import { firebaseLogout, User } from '../lib/firebase/users' import { formatMoney } from '../lib/util/format' -import { Row } from './layout/row' +import { Col } from './layout/col' import { MenuButton } from './menu' export function ProfileMenu(props: { user: User }) { @@ -67,16 +67,16 @@ function getNavigationOptions(user: User, options: { mobile: boolean }) { function ProfileSummary(props: { user: User }) { const { user } = props return ( - -
+ +
- {user.name} +
{user.name}
{formatMoney(Math.floor(user.balance))}
- + ) } diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx index cfa65f04..e464f578 100644 --- a/web/pages/_app.tsx +++ b/web/pages/_app.tsx @@ -35,7 +35,7 @@ function MyApp({ Component, pageProps }: AppProps) { /> diff --git a/web/pages/account.tsx b/web/pages/account.tsx index 87b4837d..fac283f3 100644 --- a/web/pages/account.tsx +++ b/web/pages/account.tsx @@ -9,7 +9,7 @@ function SignInCard() {
diff --git a/web/pages/landing-page.tsx b/web/pages/landing-page.tsx index b966997c..f3379576 100644 --- a/web/pages/landing-page.tsx +++ b/web/pages/landing-page.tsx @@ -34,7 +34,7 @@ const scrollToAbout = () => { function Hero() { return (
- +
- - - - - \ No newline at end of file diff --git a/web/public/logo-white.svg b/web/public/logo-white.svg new file mode 100644 index 00000000..c2109b23 --- /dev/null +++ b/web/public/logo-white.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/web/public/logo.png b/web/public/logo.png index f1cd504e..08a1486f 100644 Binary files a/web/public/logo.png and b/web/public/logo.png differ diff --git a/web/public/logo.svg b/web/public/logo.svg new file mode 100644 index 00000000..77b8dc64 --- /dev/null +++ b/web/public/logo.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file