diff --git a/packages/wonders-client/package.json b/packages/wonders-client/package.json index 5c52a9e..a8bacc7 100644 --- a/packages/wonders-client/package.json +++ b/packages/wonders-client/package.json @@ -10,12 +10,15 @@ "@types/node": "^16.11.4", "@types/react": "^17.0.5", "@types/react-dom": "^17.0.5", + "@types/roman-numerals": "^0.3.0", + "classnames": "^2.3.1", "eslint-config-react-app": "^6.0.0", "formik": "^2.2.6", "ketchup-react": "^0.1.1", "react": "^17.0.2", "react-dom": "^17.0.2", "react-scripts": "^4.0.3", + "roman-numerals": "^0.3.2", "typescript": "^4.1.2", "web-vitals": "^2.1.2", "wonders-common": "^0.1.1" @@ -44,4 +47,4 @@ "last 1 safari version" ] } -} \ No newline at end of file +} diff --git a/packages/wonders-client/src/components/App/App.css b/packages/wonders-client/src/components/App/App.css index af53574..aad4348 100644 --- a/packages/wonders-client/src/components/App/App.css +++ b/packages/wonders-client/src/components/App/App.css @@ -11,4 +11,5 @@ .wonder-game-wrapper { overflow: auto; + flex: 1; } diff --git a/packages/wonders-client/src/components/Civ/Civ.css b/packages/wonders-client/src/components/Civ/Civ.css index baa9adf..037defd 100644 --- a/packages/wonders-client/src/components/Civ/Civ.css +++ b/packages/wonders-client/src/components/Civ/Civ.css @@ -1,6 +1,5 @@ .wonder-civ { border: black solid; - margin: 1em; background-color: white; } diff --git a/packages/wonders-client/src/components/Civ/Civ.tsx b/packages/wonders-client/src/components/Civ/Civ.tsx index f3164d4..4903006 100644 --- a/packages/wonders-client/src/components/Civ/Civ.tsx +++ b/packages/wonders-client/src/components/Civ/Civ.tsx @@ -2,6 +2,7 @@ import { useMemo } from 'react' import { Player, playerStats, Resource, Science, Structure, StructureType, wonders } from 'wonders-common' import fill from 'lodash/fill' import './Civ.css' +import classNames from 'classnames' type DisplayStyle = 'player' | 'neighbor' | 'distant' @@ -72,7 +73,7 @@ export default function Civ({ player, displayStyle }: { player: Player, displayS {col.filter(type => pStats.structObjs.some(s => s.type === type)).map(type =>