diff --git a/packages/website/src/components/Button/index.module.css b/packages/website/src/components/Button/index.module.css index 0c6984e4e..3dbfe4819 100644 --- a/packages/website/src/components/Button/index.module.css +++ b/packages/website/src/components/Button/index.module.css @@ -16,9 +16,17 @@ cursor: pointer; + &[data-even-padding] { + padding: var(--space-3); + } + &[data-size="minor"] { font-size: 0.7em; padding: var(--space-2) var(--space-3); + + &[data-even-padding] { + padding: var(--space-2); + } } &[data-size="major"] { @@ -62,8 +70,6 @@ width: 1.25em; height: 1.25em; - margin: -0.25em 0; - object-fit: contain; } diff --git a/packages/website/src/components/Button/index.tsx b/packages/website/src/components/Button/index.tsx index 44e98f2d0..f16398efd 100644 --- a/packages/website/src/components/Button/index.tsx +++ b/packages/website/src/components/Button/index.tsx @@ -9,6 +9,7 @@ export interface ButtonProps extends ComponentProps<"button"> { variant?: "solid" | "surface" | "soft" | "inverted" | "ghost" | "outline"; size?: "regular" | "minor" | "major"; highContrast?: boolean; + evenPadding?: boolean; listChild?: "horizontal" | "vertical"; parentListChild?: "horizontal" | "vertical"; @@ -36,6 +37,7 @@ export function Button({ style, radius = "max", size = "regular", + evenPadding, listChild, parentListChild, @@ -53,6 +55,7 @@ export function Button({ data-list-child={listChild} data-parent-list-child={parentListChild} data-high-contrast={highContrast} + data-even-padding={evenPadding} {...props} /> ); diff --git a/packages/website/src/components/DropdownMenu/index.module.css b/packages/website/src/components/DropdownMenu/index.module.css index d9a9958de..d75c072e1 100644 --- a/packages/website/src/components/DropdownMenu/index.module.css +++ b/packages/website/src/components/DropdownMenu/index.module.css @@ -17,7 +17,7 @@ margin: var(--space-4); box-shadow: var(--shadow-subtle); - border-radius: var(--space-3); + border-radius: var(--space-4); outline: var(--outline-interactive) !important; scrollbar-width: none; diff --git a/packages/website/src/components/DropdownMenu/index.tsx b/packages/website/src/components/DropdownMenu/index.tsx index 1e0140660..8afe69f1b 100644 --- a/packages/website/src/components/DropdownMenu/index.tsx +++ b/packages/website/src/components/DropdownMenu/index.tsx @@ -2,6 +2,4 @@ import { DropdownMenu as _ } from "radix-ui"; import { composeRadixComponents } from "../../ui/compose"; import styles from "./index.module.css"; -export const DropdownMenu = composeRadixComponents(_, styles, { - Content: { align: "start" }, -}); +export const DropdownMenu = composeRadixComponents(_, styles); diff --git a/packages/website/src/components/TankSearchFilters/index.tsx b/packages/website/src/components/TankSearchFilters/index.tsx index b0c46e061..a21caf112 100644 --- a/packages/website/src/components/TankSearchFilters/index.tsx +++ b/packages/website/src/components/TankSearchFilters/index.tsx @@ -21,7 +21,6 @@ import { Button } from "../Button"; import { ClassIcon } from "../ClassIcon"; import { DropdownMenu } from "../DropdownMenu"; import { GunTypeIcon } from "../GunTypeIcon"; -import { IconButton } from "../IconButton"; import { MissingShellIcon } from "../MissingShellIcon"; import { ResearchedIcon } from "../ResearchedIcon"; import { ScienceIcon } from "../ScienceIcon"; @@ -174,7 +173,8 @@ export function TankSearchFilters() { function ResetButton() { return ( - { @@ -182,7 +182,7 @@ function ResetButton() { }} > - + ); } @@ -599,7 +599,7 @@ function IndividualShellFilter({ return ( - + @@ -709,7 +709,8 @@ function OwnershipFilterInternal() { return (
- - + - - +
); } @@ -750,7 +752,8 @@ function TestFilter() { return (
- - + - - +
); }