diff --git a/packages/website/src/components/BaseStyles.astro b/packages/website/src/components/BaseStyles.astro index 126b61735..2f9eb10d9 100644 --- a/packages/website/src/components/BaseStyles.astro +++ b/packages/website/src/components/BaseStyles.astro @@ -23,6 +23,7 @@ styles += "}"; - -
- -
diff --git a/packages/website/src/components/HomeTanks.astro b/packages/website/src/components/HomeTanks.astro index af040fafe..bfbe66f0e 100644 --- a/packages/website/src/components/HomeTanks.astro +++ b/packages/website/src/components/HomeTanks.astro @@ -2,7 +2,7 @@ import { api } from "../api/dynamic"; import { tools } from "../constants/tools"; import { Heading } from "./Heading"; -import HomeSection from "./HomeSection.astro"; +import { Section } from "./Section"; import ToolCard from "./ToolCard.astro"; import ToolCardLayoutColumn from "./ToolCardLayoutColumn.astro"; import ToolCardLayoutRoot from "./ToolCardLayoutRoot.astro"; @@ -15,7 +15,7 @@ const { locale } = Astro.props; const strings = await api.strings(locale); --- - +
{strings.home.tanks} @@ -28,4 +28,4 @@ const strings = await api.strings(locale); - +
diff --git a/packages/website/src/components/HomeTechnical.astro b/packages/website/src/components/HomeTechnical.astro index e42afdc7a..bdbe7e70a 100644 --- a/packages/website/src/components/HomeTechnical.astro +++ b/packages/website/src/components/HomeTechnical.astro @@ -2,7 +2,7 @@ import { api } from "../api/dynamic"; import { tools } from "../constants/tools"; import { Heading } from "./Heading"; -import HomeSection from "./HomeSection.astro"; +import { Section } from "./Section"; import ToolCard from "./ToolCard.astro"; import ToolCardLayoutColumn from "./ToolCardLayoutColumn.astro"; import ToolCardLayoutRoot from "./ToolCardLayoutRoot.astro"; @@ -16,7 +16,7 @@ const { locale } = Astro.props; const strings = await api.strings(locale); --- - +
{strings.home.technical} @@ -28,4 +28,4 @@ const strings = await api.strings(locale); - +
diff --git a/packages/website/src/components/NavbarFine.astro b/packages/website/src/components/NavbarFine.astro index 4719653ce..f6cce7a3f 100644 --- a/packages/website/src/components/NavbarFine.astro +++ b/packages/website/src/components/NavbarFine.astro @@ -24,7 +24,7 @@ export const filtered = Object.values(tools).filter( diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.module.css index 177e7e20a..d221ecf5f 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.module.css +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.module.css @@ -1,26 +1,6 @@ -.page { - /* Fixed to the viewport so the table scrolls, not the page */ - height: 100dvh; - +.top { display: flex; flex-direction: column; align-items: center; - box-sizing: border-box; - - .top { - display: flex; - flex-direction: column; - align-items: center; - gap: var(--space-4); - - padding: var(--space-4); - } - - .table { - align-self: stretch; - overflow: hidden; - - display: flex; - justify-content: center; - } + gap: var(--space-4); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx index 93931a70c..9f286eaa0 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx @@ -4,6 +4,7 @@ import { api } from "../../../../api/dynamic"; import { CompareControls } from "../../../../components/CompareControls"; import { CompareTable } from "../../../../components/CompareTable"; import { EmptyState } from "../../../../components/EmptyState"; +import { Section } from "../../../../components/Section"; import { tankToCompareMember } from "../../../../core/blitzkit/tankToCompareMember"; import { withErrorWrapper } from "../../../../hocs/withErrorWrapper"; import { withLocale } from "../../../../hocs/withLocale"; @@ -59,23 +60,27 @@ function Content() { }, [members]); return ( -
-
- -
+ <> +
+
+ +
+
{members.length > 0 && ( -
+
-
+ )} {members.length === 0 && ( - +
+ +
)} -
+ ); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro index 8f0b86ca2..e14704b09 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro @@ -1,5 +1,6 @@ --- import ColorScale from "../../../../components/ColorScale.astro"; +import ToolBanner from "../../../../components/ToolBanner.astro"; import { tools } from "../../../../constants/tools"; import BaseLayout from "../../../../layouts/BaseLayout.astro"; import { Page } from "./_index"; @@ -9,11 +10,13 @@ export { getStaticPaths } from "../index.astro"; const { locale } = Astro.props; --- - - - - - + + + + + + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/components.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/components.astro index 4e6cb8b7f..6c9ca42fd 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/components.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/components.astro @@ -17,11 +17,11 @@ const iconLayouts = ["leading", "trailing", "both", "icon only"] as const; const extraColors = ["red", "amber", "green"] satisfies Color[]; --- - - {extraColors.map((color) => ( - - ))} +{extraColors.map((color) => ( + +))} +

Badge

diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/index.astro index a453cde72..a0c54e850 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/index.astro @@ -8,8 +8,8 @@ export { getStaticPaths } from "../index.astro"; const { locale, embed } = Astro.props; --- - - + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro index b0403e576..50b145c09 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro @@ -11,9 +11,9 @@ const { locale } = Astro.props; // TODO: the tank search popup is complete unreviewed AI slop, write a proper system for it manually --- - - + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro index 847734b92..020adc94c 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro @@ -9,7 +9,6 @@ import HomeGames from "../../../components/HomeGames.astro"; import HomePlayers from "../../../components/HomePlayers.astro"; import HomeTanks from "../../../components/HomeTanks.astro"; import HomeTechnical from "../../../components/HomeTechnical.astro"; -import { Section } from "../../../components/Section"; import { tools, type Tool } from "../../../constants/tools"; import BaseLayout from "../../../layouts/BaseLayout.astro"; import { getStaticPaths as _getStaticPaths } from "../_index"; @@ -53,13 +52,11 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { {environment === "preview" && } -
- - - - - -
+ + + + +
diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.module.css index 266ee5f72..d221ecf5f 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.module.css +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.module.css @@ -1,21 +1,6 @@ -.page { +.top { display: flex; flex-direction: column; align-items: center; - - .top { - display: flex; - flex-direction: column; - align-items: center; - gap: var(--space-4); - - padding: var(--space-4); - } - - .table { - align-self: stretch; - - display: flex; - justify-content: center; - } + gap: var(--space-4); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.tsx index 3cc51897a..12082284e 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/performance/_index.tsx @@ -1,19 +1,22 @@ import { PerformanceControls } from "../../../../components/PerformanceControls"; import { PerformanceTable } from "../../../../components/PerformanceTable"; +import { Section } from "../../../../components/Section"; import { withErrorWrapper } from "../../../../hocs/withErrorWrapper"; import { withLocale } from "../../../../hocs/withLocale"; import styles from "./_index.module.css"; export const Page = withLocale( withErrorWrapper(() => ( -
-
- -
+ <> +
+
+ +
+
-
+
-
-
+ + )), ); diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/performance/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/performance/index.astro index 24329d8c3..b03d06c01 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/performance/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/performance/index.astro @@ -1,5 +1,6 @@ --- import ColorScale from "../../../../components/ColorScale.astro"; +import ToolBanner from "../../../../components/ToolBanner.astro"; import { tools } from "../../../../constants/tools"; import BaseLayout from "../../../../layouts/BaseLayout.astro"; import { Page } from "./_index"; @@ -9,11 +10,13 @@ export { getStaticPaths } from "../index.astro"; const { locale } = Astro.props; --- - - - - - + + + + + + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro index cccf16b1b..57f988847 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro @@ -20,11 +20,11 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const { id, locale } = Astro.props; --- - - - - - + + + + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/_index.tsx index 5bbe69982..eb0b85432 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/_index.tsx @@ -1,17 +1,7 @@ import { TankSearch } from "../../../../components/TankSearch"; -import { - LocaleProvider, - type LocaleAcceptorProps, -} from "../../../../hooks/useLocale"; +import { withLocale } from "../../../../hocs/withLocale"; import type { MaybeSkeletonComponentProps } from "../../../../types/maybeSkeletonComponentProps"; -export function Page({ - locale, - skeleton, -}: LocaleAcceptorProps & MaybeSkeletonComponentProps) { - return ( - - - - ); -} +export const Page = withLocale(({ skeleton }) => ( + +)); diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/index.astro index f8542c11d..d5bd1f892 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/index.astro @@ -11,15 +11,15 @@ export { getStaticPaths } from "../index.astro"; const { locale } = Astro.props; --- - - - - + + + + +
-