diff --git a/packages/client/src/app.tsx b/packages/client/src/app.tsx index 0acdc8d..97afe4a 100644 --- a/packages/client/src/app.tsx +++ b/packages/client/src/app.tsx @@ -6,19 +6,15 @@ import { render } from "solid-js/web"; import Root from "./routes/index"; import "virtual:uno.css"; -const Version = () => ( - <> - v{pkg.version} -
- -); - const App = () => ( ( <> {props.children} - + + {"v" + pkg.version} + +
)} > diff --git a/packages/client/src/components/Card.tsx b/packages/client/src/components/Card.tsx index 780e1dc..db3a20b 100644 --- a/packages/client/src/components/Card.tsx +++ b/packages/client/src/components/Card.tsx @@ -24,10 +24,7 @@ export default ((props) => { onClick={props.onClick} draggable={false} class={props.class} - style={{ - "border-radius": "5px", - ...props.style, - }} + style={props.style} width="100px" src={ props.face == "down" diff --git a/packages/client/src/components/Game.tsx b/packages/client/src/components/Game.tsx index dd63a12..588ff47 100644 --- a/packages/client/src/components/Game.tsx +++ b/packages/client/src/components/Game.tsx @@ -30,19 +30,13 @@ export default (props: { instanceId: string }) => { return ( -
-
- submitAction({ type: "draw" })} - /> -
- -
+ submitAction({ type: "draw" })} + /> + +
); diff --git a/packages/client/src/components/Hand.tsx b/packages/client/src/components/Hand.tsx index 38e1aaf..692ea43 100644 --- a/packages/client/src/components/Hand.tsx +++ b/packages/client/src/components/Hand.tsx @@ -3,29 +3,13 @@ import Card from "./Card"; import { Hand } from "../../../shared/cards"; import { GameContext } from "./Game"; import { produce } from "solid-js/store"; +import { Stylable } from "./toolbox"; export default ((props) => { const { submitAction, view } = useContext(GameContext)!; return ( -
+
{(card) => ( {
); -}) satisfies Component<{ hand: Hand }>; +}) satisfies Component<{ hand: Hand } & Stylable>; diff --git a/packages/client/src/components/Pile.tsx b/packages/client/src/components/Pile.tsx index a9b6016..e3377cc 100644 --- a/packages/client/src/components/Pile.tsx +++ b/packages/client/src/components/Pile.tsx @@ -5,20 +5,14 @@ import { Clickable, Stylable } from "./toolbox"; export default ((props) => { return ( -
- 0}> - - -
+ 0}> + + ); }) satisfies Component< { diff --git a/packages/client/src/routes/[game]/[instance].tsx b/packages/client/src/routes/[game]/[instance].tsx index 3cff34f..16d9a11 100644 --- a/packages/client/src/routes/[game]/[instance].tsx +++ b/packages/client/src/routes/[game]/[instance].tsx @@ -8,20 +8,7 @@ export default () => { return ( <> - + Back diff --git a/packages/client/src/style.css b/packages/client/src/style.css index 4473b24..8951ad2 100644 --- a/packages/client/src/style.css +++ b/packages/client/src/style.css @@ -44,41 +44,19 @@ a:visited { } .hand { + height: 160px; background: radial-gradient(rgb(24, 70, 82), rgb(1, 42, 41)); -} + min-width: 100px; + width: fit-content; + max-width: 90%; + border: 2px dashed white; + border-radius: 12px; -.full { - height: 100%; - width: 100%; -} + margin-bottom: 50px; + padding: 10px; -.w-full { - width: 100%; -} - -.center { + overflow: scroll; + scrollbar-width: none; display: flex; - justify-content: center; - align-items: center; -} - -.column { - display: flex; - flex-direction: column; -} - -.free { - position: absolute; - top: 0; - left: 0; -} - -.fixed-br { - position: fixed; - bottom: 0; - right: 0; -} - -.clear { - pointer-events: none; + gap: 5px; } diff --git a/packages/client/uno.config.ts b/packages/client/uno.config.ts index 7331767..c662c0d 100644 --- a/packages/client/uno.config.ts +++ b/packages/client/uno.config.ts @@ -21,5 +21,20 @@ export default defineConfig({ ["tr", { top: 0, right: 0 }], ["bl", { bottom: 0, left: 0 }], ["br", { bottom: 0, right: 0 }], + [ + "bc", + { + bottom: 0, + left: 0, + right: 0, + "margin-left": "auto", + "margin-right": "auto", + }, + ], + + [ + "center", + { top: "50%", left: "50%", transform: "translate(-50%, -50%)" }, + ], ], });