diff --git a/app/components/followAccount.module.css b/app/components/followAccount.module.css index ce630a80..619fb3a9 100644 --- a/app/components/followAccount.module.css +++ b/app/components/followAccount.module.css @@ -1,25 +1,25 @@ .followAccount { - border: solid #000; - border-width: 0 0 0.5px; + border: solid var(--color-border); + border-width: 0 0 var(--border-width-thin); .avatar { - width: 3rem; - height: 3rem; + width: var(--size-avatar); + height: var(--size-avatar); - border: 0.5px solid #666; + border: var(--border-width-thin) solid var(--color-muted); - border-radius: 50%; + border-radius: var(--radius-full); } .avatarNameContainer { display: flex; align-items: center; - padding: 0.5rem; + padding: var(--space-0-5); } div:hover { - background-color: #f4f4f6; + background-color: var(--color-surface-hover); } a { @@ -27,6 +27,6 @@ } .accountNameContainer { - margin-left: 0.5rem; + margin-left: var(--space-0-5); } } diff --git a/app/components/loadMoreNote.module.css b/app/components/loadMoreNote.module.css index 45ead677..5d8ac2c1 100644 --- a/app/components/loadMoreNote.module.css +++ b/app/components/loadMoreNote.module.css @@ -2,11 +2,11 @@ text-align: center; div { - border: solid #000; - border-width: 0.5px 0; + border: solid var(--color-border); + border-width: var(--border-width-thin) 0; } div:hover { - background-color: #f4f4f6; + background-color: var(--color-surface-hover); } } diff --git a/app/components/login.module.css b/app/components/login.module.css index 0ce797e8..167b57d7 100644 --- a/app/components/login.module.css +++ b/app/components/login.module.css @@ -9,7 +9,7 @@ } .errorMessage { - color: var(--color-destructive-500, #d92d20); - margin-bottom: 1rem; + color: var(--color-error); + margin-bottom: var(--space-1); text-align: center; } diff --git a/app/components/note.module.css b/app/components/note.module.css index 2c273c04..06de2014 100644 --- a/app/components/note.module.css +++ b/app/components/note.module.css @@ -1,11 +1,11 @@ .note { - border: solid #000; - border-width: 0 0 0.5px 0; - padding: 0.5rem; + border: solid var(--color-border); + border-width: 0 0 var(--border-width-thin) 0; + padding: var(--space-0-5); } .renoteHeader { - font-size: small; - color: #666; - padding: 0.25rem 0; + font-size: var(--font-size-small); + color: var(--color-muted); + padding: var(--space-0-25) 0; } diff --git a/app/components/noteAuthor.module.css b/app/components/noteAuthor.module.css index 88cb0aa5..f2705cd4 100644 --- a/app/components/noteAuthor.module.css +++ b/app/components/noteAuthor.module.css @@ -1,5 +1,5 @@ .accountNameContainer { - font-size: small; + font-size: var(--font-size-small); display: flex; align-items: center; overflow: hidden; @@ -12,19 +12,19 @@ span { font-weight: lighter; - font-size: small; + font-size: var(--font-size-small); } } } .avatarImageContainer { - width: 3rem; - height: 3rem; - margin-right: 0.5rem; + width: var(--size-avatar); + height: var(--size-avatar); + margin-right: var(--space-0-5); img { - width: 3rem; - height: 3rem; - border-radius: 9999px; + width: var(--size-avatar); + height: var(--size-avatar); + border-radius: var(--radius-full); } } diff --git a/app/components/sideBar.module.css b/app/components/sideBar.module.css index bb6bd85b..d79e06f7 100644 --- a/app/components/sideBar.module.css +++ b/app/components/sideBar.module.css @@ -8,40 +8,34 @@ .loggedInAccountContainer { display: flex; align-items: center; - margin-top: 0.5rem; + margin-top: var(--space-0-5); span { - margin-left: 0.5rem; + margin-left: var(--space-0-5); } .avatar { - width: 3rem; - height: 3rem; - border-radius: 9999px; - - img { - width: 3rem; - height: 3rem; - border-radius: 9999px; - } + width: var(--size-avatar); + height: var(--size-avatar); + border-radius: var(--radius-full); } } .loginButton { width: 100%; - padding: 10px; + padding: var(--space-0-75); } .sideBar { display: flex; flex-direction: column; - margin-top: 32px; - margin-right: 16px; - gap: 8px; + margin-top: var(--space-2); + margin-right: var(--space-1); + gap: var(--space-0-5); .link { font-size: 1.2rem; - padding: 10px; + padding: var(--space-0-75); } } diff --git a/app/components/signup.module.css b/app/components/signup.module.css index 8faaa0fe..da25dd98 100644 --- a/app/components/signup.module.css +++ b/app/components/signup.module.css @@ -2,7 +2,7 @@ display: flex; flex-direction: column; align-items: center; - gap: 8px; + gap: var(--space-0-5); label { input { diff --git a/app/root.module.css b/app/root.module.css index 83203a58..32328504 100644 --- a/app/root.module.css +++ b/app/root.module.css @@ -22,7 +22,7 @@ body { min-height: 100lvh; height: 100%; box-sizing: border-box; - padding: 0.5rem 0; - border: solid; - border-width: 0 0.5px; + padding: var(--space-0-5) 0; + border: solid var(--color-border); + border-width: 0 var(--border-width-thin); } diff --git a/app/root.tsx b/app/root.tsx index 126a08ae..87b60ea6 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -14,6 +14,7 @@ import { } from "~/lib/api/loggedInAccount"; import { cloudflareContext } from "~/lib/cloudflareContext"; +import "~/styles/tokens.css"; import styles from "~/root.module.css"; export async function loader({ diff --git a/app/routes/accounts.$id.edit.tsx b/app/routes/accounts.$id.edit.tsx index afc2fb98..ff1cf887 100644 --- a/app/routes/accounts.$id.edit.tsx +++ b/app/routes/accounts.$id.edit.tsx @@ -10,6 +10,8 @@ import { getToken } from "~/lib/api/getToken"; import { loggedInAccount } from "~/lib/api/loggedInAccount"; import { cloudflareContext } from "~/lib/cloudflareContext"; +import styles from "~/styles/accountEdit.module.css"; + const ERROR_MESSAGES = { invalidRequest: "Invalid request. Please try again.", accountNotFound: "Account not found.", @@ -144,31 +146,21 @@ export default function AccountEdit() { if (loaderData.error !== undefined) { return ( -
+

{loaderData.error}

); } return ( -
+

Edit Account

-

+

{loaderData.account.nickname} ({loaderData.account.name})

-
-
+ +
-
+