Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into granular-weights
Browse files Browse the repository at this point in the history
  • Loading branch information
noahm committed Feb 26, 2024
2 parents 5a96724 + 322205e commit f04569b
Show file tree
Hide file tree
Showing 3 changed files with 312 additions and 306 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@
"@types/node": "^20.8.9",
"@types/react": "^18.2.33",
"@types/react-dom": "^18.2.19",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"autoprefixer": "^10.4.17",
"axios": "^1.6.7",
"babel-loader": "^9.1.3",
"better-sqlite3": "^9.4.1",
"better-sqlite3": "^9.4.3",
"cacheable-lookup": "^7.0.0",
"classnames": "^2.3.3",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^12.0.2",
"cross-spawn": "^7.0.3",
"css-loader": "^6.10.0",
"css-minimizer-webpack-plugin": "^6.0.0",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react-hooks": "^4.6.0",
Expand All @@ -78,15 +78,15 @@
"html-loader": "^5.0.0",
"html-webpack-plugin": "^5.6.0",
"iconv-lite": "^0.6.3",
"inquirer": "^9.2.14",
"jimp": "^0.22.10",
"jotai": "^2.6.4",
"inquirer": "^9.2.15",
"jimp": "^0.22.12",
"jotai": "^2.6.5",
"jsdom": "^24.0.0",
"json-schema-to-typescript": "^13.1.2",
"jsonschema": "^1.4.1",
"mini-css-extract-plugin": "^2.8.0",
"modern-screenshot": "^4.4.38",
"nanoid": "^5.0.5",
"nanoid": "^5.0.6",
"normalize.css": "^8.0.1",
"p-queue": "^8.0.1",
"peerjs": "^2.0.0-beta.3",
Expand All @@ -103,7 +103,7 @@
"style-loader": "^3.3.4",
"typescript": "^5.3.3",
"victory": "^36.9.1",
"webpack": "^5.90.2",
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.2",
"webpack-sources": "^3.2.1",
Expand Down
26 changes: 16 additions & 10 deletions src/tournament-mode/drawing-labels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,25 @@ function Versus() {
return (
<div className={styles.versus} onClick={ipp}>
<Icon
icon={<CaretLeft />}
style={{
visibility: priorityPlayer === 1 ? "visible" : "hidden",
verticalAlign: "middle",
}}
icon={
<CaretLeft
style={{
visibility: priorityPlayer === 1 ? "visible" : "hidden",
verticalAlign: "middle",
}}
/>
}
/>
{" vs "}
<Icon
icon={<CaretRight />}
style={{
visibility: priorityPlayer === 2 ? "visible" : "hidden",
verticalAlign: "middle",
}}
icon={
<CaretRight
style={{
visibility: priorityPlayer === 2 ? "visible" : "hidden",
verticalAlign: "middle",
}}
/>
}
/>
</div>
);
Expand Down
Loading

0 comments on commit f04569b

Please sign in to comment.