From 22b77398adb8ecfdfec52cd58e563cfdb74ffa8c Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 29 May 2026 14:01:12 -0500 Subject: [PATCH] grid layout --- bun.lock | 1 + package.json | 1 + .../src/components/BaseStyles.astro | 3 +- .../index.module.css | 61 ++++++++++++++----- .../TankopediaCharacteristics/index.tsx | 32 ++++++++-- 5 files changed, 76 insertions(+), 22 deletions(-) diff --git a/bun.lock b/bun.lock index b14812501..968745477 100644 --- a/bun.lock +++ b/bun.lock @@ -5,6 +5,7 @@ "": { "name": "blitzkit", "dependencies": { + "prettier": "^3.8.3", "typescript": "^5.9.3", }, }, diff --git a/package.json b/package.json index 94ab0e38d..385e200a7 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "packages/*" ], "dependencies": { + "prettier": "^3.8.3", "typescript": "^5.9.3" } } diff --git a/packages/website-ue/src/components/BaseStyles.astro b/packages/website-ue/src/components/BaseStyles.astro index 85a03c492..445cc011a 100644 --- a/packages/website-ue/src/components/BaseStyles.astro +++ b/packages/website-ue/src/components/BaseStyles.astro @@ -19,6 +19,7 @@ import "@fontsource-variable/roboto-flex"; --page-width: 64rem; --max-size: max(100vw, 100vh); + --radius-max: var(--max-size); --font-size-regular: 1rem; --font-size-minor: 0.75rem; @@ -106,7 +107,7 @@ import "@fontsource-variable/roboto-flex"; } &[data-radius="max"] { - border-radius: var(--max-size); + border-radius: var(--radius-max); } } diff --git a/packages/website-ue/src/components/TankopediaCharacteristics/index.module.css b/packages/website-ue/src/components/TankopediaCharacteristics/index.module.css index d3765b24a..e510ab302 100644 --- a/packages/website-ue/src/components/TankopediaCharacteristics/index.module.css +++ b/packages/website-ue/src/components/TankopediaCharacteristics/index.module.css @@ -41,30 +41,59 @@ } .content { - --cell-width: 5rem; - --toy-span: 3; + --cell-width: 3rem; + --toy-span: 5; - display: grid; - grid-auto-rows: var(--cell-width); - grid-template-columns: repeat(auto-fill, minmax(var(--cell-width), 1fr)); - grid-auto-flow: row dense; - gap: var(--space-4); + display: grid; + grid-auto-rows: var(--cell-width); + grid-template-columns: repeat(auto-fill, minmax(var(--cell-width), 1fr)); + grid-auto-flow: row dense; + gap: var(--space-4); - .item { - background-color: red; - grid-row: span 1; - grid-column: span var(--toy-span); + .item { + grid-row: span 1; + grid-column: span var(--toy-span); + + display: flex; + flex-direction: column; + gap: var(--space-2); + + .value { + display: flex; + justify-content: space-between; } - .toy { - grid-row: span var(--toy-span); - grid-column: span var(--toy-span); + .ranking { + display: flex; + align-items: center; + gap: var(--space-3); + + .bar-wrapper { + flex: 1; + height: var(--space-2); background-color: var(--gray-3); - border: var(--gray-5) solid var(--space-1); + border-radius: var(--radius-max); + overflow: hidden; - border-radius: var(--space-3); + .bar { + background-color: green; + width: 75%; + height: 100%; + } + } } + } + + .toy { + grid-row: span var(--toy-span); + grid-column: span var(--toy-span); + + background-color: var(--gray-3); + border: var(--gray-5) solid var(--space-1); + + border-radius: var(--space-3); + } } } } diff --git a/packages/website-ue/src/components/TankopediaCharacteristics/index.tsx b/packages/website-ue/src/components/TankopediaCharacteristics/index.tsx index 0a5ed1c14..7ac6c56ee 100644 --- a/packages/website-ue/src/components/TankopediaCharacteristics/index.tsx +++ b/packages/website-ue/src/components/TankopediaCharacteristics/index.tsx @@ -7,6 +7,7 @@ import { type CharacteristicsGroup, } from "../../tankopedia/characteristicsOrder"; import { Heading } from "../Heading"; +import { Text } from "../Text"; import styles from "./index.module.css"; export function TankopediaCharacteristics() { @@ -29,7 +30,11 @@ function Group({ group, order }: CharacteristicsGroup) {
{isOpen ? : } - {strings.tanks.characteristics.titles[group]} + { + (strings.tanks.characteristics.titles as Record)[ + group + ] + }
@@ -49,10 +54,27 @@ interface ToyProps { toy: string; } +function Item({ name }: CharacteristicRenderConfig) { + return ( + +
+ {name} + 123 +
+ +
+
+
+
+ + + 1 / 132 + +
+ + ); +} + function Toy({ toy }: ToyProps) { return ; } - -function Item({ name }: CharacteristicRenderConfig) { - return ; -}