Skip to content

Commit

Permalink
Merge pull request #4 from barclayd/chore/fix-tailwind
Browse files Browse the repository at this point in the history
chore: improve tailwind colors
  • Loading branch information
barclayd authored Dec 21, 2024
2 parents 39fbc0b + df5cd9c commit 3d0fb0d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
12 changes: 11 additions & 1 deletion apps/web/app/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,18 @@

@layer theme, base, components, utilities;

@theme {
--color-white-100: #ffffff;
--color-white-200: #f8feff;
--color-white-300: #f2ece6;
--color-orange-300: #e5b99b;
--color-blue-300: #97cbd2;
--color-purple-300: #a38aba;
}

@layer theme {
:root {
--font-sans: '"Inter"', ui-sans-serif, system-ui, sans-serif;
--font-sans: "Inter", ui-sans-serif, system-ui, sans-serif;
--font-serif: "Playfair Display", ui-sans-serif, system-ui, sans-serif;
}
}
4 changes: 4 additions & 0 deletions apps/web/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ export const links: Route.LinksFunction = () => [
rel: 'stylesheet',
href: 'https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
},
{
rel: 'stylesheet',
href: 'https://fonts.googleapis.com/css2?family=Playfair+Display:ital,wght@0,400..900;1,400..900&family=Playwrite+US+Modern:[email protected]&display=swap',
},
{ rel: 'stylesheet', href: stylesheet },
];

Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/routes/_index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ export async function loader() {
}

export default function Home({ loaderData }: Route.ComponentProps) {
return <h1 className="font-sans text-2xl">{loaderData?.data?.id ?? 4}</h1>;
return <h1 className="font-serif text-2xl">{loaderData?.data?.id ?? 4}</h1>;
}
2 changes: 1 addition & 1 deletion apps/web/app/server/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createTRPCClient, httpBatchLink } from '@trpc/client';
import type { AppRouter } from '../../../server/src';
import type { AppRouter } from '../../../server/src/router';

export const client = createTRPCClient<AppRouter>({
links: [
Expand Down

0 comments on commit 3d0fb0d

Please sign in to comment.