diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 2962af18d..7d53b3868 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -70,12 +70,14 @@ "brake_force": "Brake force", "weight": "Weight", "power_to_weight": "Power to weight", - "hard_terrain_coefficient": "Hard terrain coefficient", - "medium_terrain_coefficient": "Medium terrain coefficient", - "soft_terrain_coefficient": "Soft terrain coefficient", - "hard_terrain_coefficient_raw": "Raw hard terrain coefficient", - "medium_terrain_coefficient_raw": "Raw medium terrain coefficient", - "soft_terrain_coefficient_raw": "Raw soft terrain coefficient", + "terrain_coefficient": "Terrain coefficients", + "raw_terrain_coefficient": "Raw terrain coefficients", + "hard_terrain_coefficient": "Hard", + "medium_terrain_coefficient": "Medium", + "soft_terrain_coefficient": "Soft", + "hard_terrain_coefficient_raw": "Hard", + "medium_terrain_coefficient_raw": "Medium", + "soft_terrain_coefficient_raw": "Soft", "hull_traverse_speed": "Hull traverse speed", "turret_traverse_speed": "Turret traverse speed", "gun_traverse_speed": "Gun traverse speed", diff --git a/packages/website/src/components/TankopediaCharacteristics/index.module.css b/packages/website/src/components/TankopediaCharacteristics/index.module.css index a1b25fe43..37249ef07 100644 --- a/packages/website/src/components/TankopediaCharacteristics/index.module.css +++ b/packages/website/src/components/TankopediaCharacteristics/index.module.css @@ -35,7 +35,7 @@ display: flex; align-items: center; - margin: 0 calc(var(--space-4)); + margin: 0 calc(var(--space-3)); .center { flex: 1; @@ -67,8 +67,6 @@ grid-auto-rows: inherit; .item { - padding: 0 var(--space-3); - grid-row: span 1; display: flex; @@ -76,6 +74,10 @@ justify-content: center; gap: var(--space-2); + &[data-indent="true"] { + padding-left: var(--space-5); + } + .value { display: flex; justify-content: space-between; @@ -107,6 +109,13 @@ } } + .label { + grid-row: span 1; + + display: flex; + align-items: center; + } + .toy { grid-row: span var(--group-span); padding: var(--space-4) 0; diff --git a/packages/website/src/components/TankopediaCharacteristics/index.tsx b/packages/website/src/components/TankopediaCharacteristics/index.tsx index 62f5f128f..f8e4f3dc0 100644 --- a/packages/website/src/components/TankopediaCharacteristics/index.tsx +++ b/packages/website/src/components/TankopediaCharacteristics/index.tsx @@ -50,9 +50,14 @@ interface GroupProps { function Group({ group, characteristics }: GroupProps) { const strings = useStrings(); const toys = group.order.filter((item) => "toy" in item).length; - const items = group.order.filter( + const characteristicsCount = group.order.filter( (item) => "name" in item && characteristics.has(item.name), ).length; + const labelsCount = + characteristicsCount > 0 + ? group.order.filter((item) => "label" in item).length + : 0; + const items = characteristicsCount + labelsCount; const groupSpan = `calc(${toys} * var(--group-span) + ${items} + 2)`; const contentSpan = `calc(${toys} * var(--group-span) + ${items})`; @@ -88,6 +93,7 @@ function Group({ group, characteristics }: GroupProps) { {group.order.map((item) => ( <> {"toy" in item && } + {"label" in item &&