diff --git a/app/components/Logo.tsx b/app/components/Logo.tsx index 985e8cd..d2a3b05 100644 --- a/app/components/Logo.tsx +++ b/app/components/Logo.tsx @@ -1,50 +1,7 @@ export default function Logo() { return ( -
- GitButler Logo - - - - - - - - - - - +
+

GitButler ⧓

) } diff --git a/app/global.css b/app/global.css index bdf1f79..d73c1bc 100644 --- a/app/global.css +++ b/app/global.css @@ -18,7 +18,7 @@ --clr-accent: #97eae5; --clr-err-50: #dc606b; --clr-warn-50: #dc9b14; - --font-system: system-ui, sans-serif; + --font-accent: "But Head", sans-serif; } /* change selection */ @@ -49,7 +49,7 @@ body { } &::-webkit-scrollbar-thumb { - background: color-mix(in srgb, var(--clr-accent) 96%, var(--clr-black)); + background: color-mix(in srgb, var(--clr-dark-gray) 60%, transparent); } } @@ -58,3 +58,7 @@ iframe[src*="youtube"] { border-radius: 0.5rem; @apply h-full w-full; } + +.font-accent { + font-family: var(--font-accent); +} diff --git a/app/layout.tsx b/app/layout.tsx index 653796e..008d7e9 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -3,6 +3,8 @@ import { Provider } from "./provider" import { Inter } from "next/font/google" import type { Metadata, Viewport } from "next" import type { ReactNode } from "react" +import "@gitbutler/design-core/fonts" + import Script from "next/script" const baseUrl = diff --git a/content/docs/index.mdx b/content/docs/index.mdx index 0b429a8..85927f5 100644 --- a/content/docs/index.mdx +++ b/content/docs/index.mdx @@ -35,4 +35,3 @@ The GitButler client is a powerful Git client. You can manage your branches, wor - [First Class Conflicts](/features/branch-management/merging) - [Project History](/features/timeline) - diff --git a/package.json b/package.json index 3e48410..3d1380c 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@fumadocs/mdx-remote": "^0.2.3", + "@gitbutler/design-core": "^1.2.0", "@radix-ui/react-dialog": "^1.1.2", "@shikijs/transformers": "^1.22.2", "cmdk": "^1.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d7ec50..00cff9a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@fumadocs/mdx-remote': specifier: ^0.2.3 version: 0.2.4(acorn@8.12.1)(fumadocs-core@14.7.7(@types/react@18.3.12)(next@15.0.3(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(next@15.0.3(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + '@gitbutler/design-core': + specifier: ^1.2.0 + version: 1.2.0 '@radix-ui/react-dialog': specifier: ^1.1.2 version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -411,6 +414,9 @@ packages: resolution: {integrity: sha512-vVnuwLqW8WJsg09EanNHnXnzsjYYsZE7JlD4M1sLvDnWGjvYJKNU6VpRqDxOiDChUszDZFKhxQSNYGShF0bKJg==} engines: {node: '>=18.0.0'} + '@gitbutler/design-core@1.2.0': + resolution: {integrity: sha512-FP1e1ysMw+x7sANuhfFLJzVXFdWgPkhZbNaiXzeTK1iWxE5BBAL949SNoWFpXJ7TAcKAq0/MUNySZ7TLZVFODA==} + '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} @@ -4540,6 +4546,8 @@ snapshots: js-yaml: 4.1.0 prettier: 3.3.3 + '@gitbutler/design-core@1.2.0': {} + '@humanfs/core@0.19.1': {} '@humanfs/node@0.16.6': diff --git a/public/fav/fav-180.png b/public/fav/fav-180.png index 56b0a6c..14e7514 100644 Binary files a/public/fav/fav-180.png and b/public/fav/fav-180.png differ diff --git a/public/fav/fav-32.png b/public/fav/fav-32.png index d1e6c4f..3d95b6d 100644 Binary files a/public/fav/fav-32.png and b/public/fav/fav-32.png differ diff --git a/public/fav/fav-64.png b/public/fav/fav-64.png index 7d8a313..22bf16d 100644 Binary files a/public/fav/fav-64.png and b/public/fav/fav-64.png differ diff --git a/public/fav/fav-svg.svg b/public/fav/fav-svg.svg index c4e1fae..1c5c005 100644 --- a/public/fav/fav-svg.svg +++ b/public/fav/fav-svg.svg @@ -1,11 +1,11 @@ - - - + + + + - - - - + + + diff --git a/public/fonts/SplineSansMono-Medium.woff2 b/public/fonts/SplineSansMono-Medium.woff2 deleted file mode 100644 index e13bcfc..0000000 Binary files a/public/fonts/SplineSansMono-Medium.woff2 and /dev/null differ diff --git a/public/fonts/SplineSansMono-Regular.woff2 b/public/fonts/SplineSansMono-Regular.woff2 deleted file mode 100644 index e13bcfc..0000000 Binary files a/public/fonts/SplineSansMono-Regular.woff2 and /dev/null differ diff --git a/public/fonts/SplineSansMono-Semibold.woff2 b/public/fonts/SplineSansMono-Semibold.woff2 deleted file mode 100644 index e13bcfc..0000000 Binary files a/public/fonts/SplineSansMono-Semibold.woff2 and /dev/null differ