Skip to content
This repository was archived by the owner on Nov 25, 2024. It is now read-only.

Commit

Permalink
fix button proportions (#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
adjsky authored May 18, 2024
1 parent 52d81e3 commit f83fab3
Show file tree
Hide file tree
Showing 21 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ tilt up
есть возможность запустить их вручную через консоль.

```bash
pnpm test:watch
pnpm test:e2e
```

## Открытие Pull Request'а
Expand Down
6 changes: 1 addition & 5 deletions apps/client/src/components/available-sessions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ const AvailableSessions: React.FC = () => {

return (
<>
<Button
variant="outlined"
className="w-36 uppercase"
onClick={handleOpen}
>
<Button variant="outlined" className="uppercase" onClick={handleOpen}>
Комнаты
</Button>
<SessionsModal isOpen={isOpen} onClose={handleClose} />
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/components/back-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const BackButton: React.FC<{ onClick?: () => void }> = ({ onClick }) => {
<Button
variant="outlined"
onClick={onClick}
className="px-4 py-3 text-base uppercase"
className="text-base uppercase"
data-testid="back-button"
icon={<ArrowLeft />}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/components/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Button: React.FC<React.PropsWithChildren<ButtonProps>> = ({
return (
<button
className={cn(
"flex items-center justify-center",
"flex items-center justify-center p-4",
"rounded-lg text-xl leading-none transition-colors sm:leading-none",
variantClasses[variant],
icon && "group gap-2",
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/components/player-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const KickModal: React.FC<{
<div className="mt-4 flex w-full gap-2">
<Button
variant="outlined"
className="flex-1 py-3 uppercase"
className="flex-1 uppercase"
onClick={onClose}
>
Нет
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/screens/entry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const Entry: React.FC = () => {
<Button
variant="filled"
onClick={() => createOrJoinSession(sessionId ?? undefined)}
className="h-12 w-32 uppercase"
className="w-32 uppercase"
disabled={disabled}
data-testid="connect-session"
>
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/screens/game.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ const Discard: React.FC<{ score: number; onDiscard?: () => void }> = ({
<div className="mt-4 flex w-full gap-2">
<Button
variant="outlined"
className="flex-1 py-3 uppercase"
className="flex-1 uppercase"
onClick={() => setOpen(false)}
data-testid="abort-discard-hand"
>
Expand Down
8 changes: 4 additions & 4 deletions apps/client/src/screens/waiting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ const Waiting: React.FC = () => {
</>
)}
</div>
<div className="flex w-full justify-center gap-2">
<div className="mx-auto flex gap-2 ">
<InviteButton id={id} />
<StartButton
onClick={onStart}
Expand Down Expand Up @@ -365,7 +365,7 @@ const StartButton: React.FC<{
<Button
variant="filled"
onClick={onClick}
className={cn("w-28 uppercase sm:w-32", disabled && "opacity-50")}
className={cn("uppercase", disabled && "opacity-50")}
disabled={disabled}
data-testid="start-game"
>
Expand All @@ -388,10 +388,10 @@ const InviteButton: React.FC<{ id: string }> = ({ id }) => {
}, [copied, toggleCopied])

return (
<div className="relative">
<div className="relative flex">
<Button
variant="outlined"
className="px-4 py-4 uppercase sm:px-5"
className="uppercase"
onClick={async () => {
const url = `${window.location.origin}?s=${id}`

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"scripts": {
"ts-check": "turbo ts-check",
"test:e2e:slow": "pnpm --filter=e2e test:slow",
"test:e2e:update-snapshots": "pnpm --filter=e2e test:update",
"test:e2e:update-snapshots": "pnpm --filter=e2e test:update-snapshots",
"test:e2e": "pnpm --filter=e2e test",
"dev:client": "turbo dev --filter=client",
"dev:server": "turbo dev --filter=server",
Expand Down

0 comments on commit f83fab3

Please sign in to comment.