diff --git a/app/components/play/GroupCard.tsx b/app/components/play/GroupCard.tsx
index 1366e4804..6edb7e8f4 100644
--- a/app/components/play/GroupCard.tsx
+++ b/app/components/play/GroupCard.tsx
@@ -60,7 +60,7 @@ export function GroupCard({
{typeof ranked === "boolean" && (
- {ranked ? "Ranked" : "Unranked"}
+ {ranked ? "Ranked" : "Scrim"}
)}
diff --git a/app/components/play/LFGGroupSelector.tsx b/app/components/play/LFGGroupSelector.tsx
index 893110d5e..3be582e80 100644
--- a/app/components/play/LFGGroupSelector.tsx
+++ b/app/components/play/LFGGroupSelector.tsx
@@ -10,13 +10,13 @@ const OPTIONS = [
type: "VERSUS-RANKED",
image: "rotations",
text: "Versus",
- explanation: "Private Battle (ranked)",
+ explanation: "Ranked",
},
{
type: "VERSUS-UNRANKED",
image: "rotations",
text: "Versus",
- explanation: "Private Battle (unranked)",
+ explanation: "Scrim",
},
{
type: "TWIN",
@@ -32,27 +32,51 @@ const OPTIONS = [
},
] as const;
+type Type = "VERSUS-RANKED" | "VERSUS-UNRANKED" | "TWIN" | "QUAD";
+
export function LFGGroupSelector({
counts,
}: {
counts: PlayFrontPageLoader["counts"];
}) {
- const [type, setType] = React.useState("VERSUS-RANKED");
+ const [selectedType, setSelectedType] = React.useState
("VERSUS-RANKED");
+
+ const count = (
+ type: "VERSUS-RANKED" | "VERSUS-UNRANKED" | "TWIN" | "QUAD"
+ ) => {
+ switch (type) {
+ case "VERSUS-RANKED":
+ case "VERSUS-UNRANKED":
+ return counts["VERSUS"];
+ case "QUAD":
+ return counts["QUAD"];
+ case "TWIN":
+ return counts["TWIN"];
+ }
+ };
return (
<>
-
+
{OPTIONS.map((option, i) => {
return (
-
+ 1 })}
+ value={option.type}
+ >
{({ checked }) => (
+ {/* TODO: remove */}
![]()
{
};
export interface PlayFrontPageLoader {
- counts: Record<"TWIN" | "QUAD" | "VERSUS-RANKED" | "VERSUS-UNRANKED", number>;
+ counts: Record<"TWIN" | "QUAD" | "VERSUS", number>;
ownMMR?: {
value: number;
topX?: number;
diff --git a/app/styles/global.css b/app/styles/global.css
index 5ab8a1007..d4e5ed7c8 100644
--- a/app/styles/global.css
+++ b/app/styles/global.css
@@ -651,3 +651,7 @@ hr {
.rounded {
border-radius: var(--rounded);
}
+
+.z-10 {
+ z-index: 10;
+}
diff --git a/app/styles/play.css b/app/styles/play.css
index ebd6b78bd..715869902 100644
--- a/app/styles/play.css
+++ b/app/styles/play.css
@@ -19,7 +19,6 @@
display: flex;
flex-direction: column;
justify-content: center;
- gap: var(--s-3);
}
.play__type-radio-group__item {
@@ -30,9 +29,22 @@
margin: 0 auto;
background-color: var(--bg-lighter-transparent);
border-radius: var(--rounded);
- cursor: pointer;
}
+.play__type-radio-group__item.top-half {
+ border-radius: 0;
+ border-start-end-radius: var(--rounded);
+ border-start-start-radius: var(--rounded);
+}
+
+/* stylelint-disable */
+.play__type-radio-group__item.bottom-half {
+ border-radius: 0;
+ border-end-end-radius: var(--rounded);
+ border-end-start-radius: var(--rounded);
+}
+/* stylelint-enable */
+
.play__type-radio-group__item:hover {
background-color: var(--theme-transparent);
}
@@ -75,6 +87,10 @@
margin-inline-start: auto;
}
+.play__type-radio-group__label__count.scooted-over {
+ margin-block-end: -30px;
+}
+
.play__type-radio-group__label__count.checked {
color: var(--button-text-transparent);
}
@@ -83,6 +99,14 @@
width: 1rem;
}
+.play__forced-black-number {
+ color: var(--button-text-transparent);
+}
+
+.play__forced-white-number {
+ color: var(--text-lighter);
+}
+
.play__type-radio-group__image {
width: 2rem;
height: 2rem;