diff --git a/app/styles/faq.css b/app/features/info/routes/faq.module.css similarity index 86% rename from app/styles/faq.css rename to app/features/info/routes/faq.module.css index 65cb9858f..4e376a78b 100644 --- a/app/styles/faq.css +++ b/app/features/info/routes/faq.module.css @@ -1,4 +1,4 @@ -.faq__summary { +.summary { padding: var(--s-3); border-radius: var(--rounded); background-color: var(--bg-lighter); @@ -6,7 +6,7 @@ font-weight: var(--bold); } -.faq__details > p { +.details { margin-inline: var(--s-4); padding-block: var(--s-3); white-space: pre-line; diff --git a/app/features/info/routes/faq.tsx b/app/features/info/routes/faq.tsx index 6b0fdb9fe..f9fdcd21e 100644 --- a/app/features/info/routes/faq.tsx +++ b/app/features/info/routes/faq.tsx @@ -4,7 +4,7 @@ import { Main } from "~/components/Main"; import { metaTags } from "~/utils/remix"; import type { SendouRouteHandle } from "~/utils/remix.server"; -import "~/styles/faq.css"; +import styles from "./faq.module.css"; const AMOUNT_OF_QUESTIONS = 9; @@ -28,11 +28,12 @@ export default function FAQPage() { {new Array(AMOUNT_OF_QUESTIONS).fill(null).map((_, i) => { const questionNumber = i + 1; return ( -
- +
+ {t(`faq:q${questionNumber}` as any)}

-

+
{filter._tag === "Weapon" && ( svg { +.editButton > svg { width: 12px; } -.lfg-post__tier-pill--end { - border-radius: var(--rounded) 0 0 var(--rounded); -} - -.lfg-post__tier-pill--start { - border-radius: 0 var(--rounded) var(--rounded) 0; -} - -.lfg-post__tier { +.tier { position: absolute; top: -3px; right: 4px; } -.lfg-post__tier-pill { +.tierPill { width: 60px; } -.lfg__filter { - padding: var(--s-1-5) var(--s-2); - background-color: var(--bg-lighter); - border-radius: var(--rounded); +.tierPillStart { + border-radius: 0 var(--rounded) var(--rounded) 0; +} + +.tierPillEnd { + border-radius: var(--rounded) 0 0 var(--rounded); } diff --git a/app/features/lfg/components/LFGPost.tsx b/app/features/lfg/components/LFGPost.tsx index 2224dd188..f4fd3c5f2 100644 --- a/app/features/lfg/components/LFGPost.tsx +++ b/app/features/lfg/components/LFGPost.tsx @@ -26,6 +26,8 @@ import { import { hourDifferenceBetweenTimezones } from "../core/timezone"; import type { LFGLoaderData, TiersMap } from "../routes/lfg"; +import styles from "./LFGPost.module.css"; + type Post = LFGLoaderData["posts"][number]; export function LFGPost({ @@ -50,8 +52,8 @@ function UserLFGPost({ post, tiersMap }: { post: Post; tiersMap: TiersMap }) { const [isExpanded, setIsExpanded] = React.useState(false); return ( -
-
+
+
+
@@ -209,7 +211,7 @@ function PostTeamMember({
- + {member.username} {tier ? : null} @@ -231,7 +233,7 @@ function PostUserHeader({
- + {author.username} {" "} {author.country ? : null} @@ -329,7 +331,7 @@ function PostPills({ } function PostTimezonePillPlaceholder() { - return
; + return
; } const currentSeasonNth = currentOrPreviousSeason(new Date())!.nth; @@ -372,20 +374,20 @@ function PostSkillPill({ }) { return (
S{seasonNth} - +
); } function PostPlusServerPill({ plusTier }: { plusTier: number }) { return ( -
+
{plusTier}
@@ -409,7 +411,7 @@ function PostTimezonePill({ timezone }: { timezone: string }) { }; return ( -
+
{diff === 0 ? "±" : ""} {diff > 0 ? "+" : ""} {diff}h @@ -419,7 +421,7 @@ function PostTimezonePill({ timezone }: { timezone: string }) { function PostLanguagePill({ languages }: { languages: string }) { return ( -
+
{languages.replace(/,/g, " / ").toUpperCase()}
); @@ -439,7 +441,7 @@ function PostEditButton({ id }: { id: number }) { const { t } = useTranslation(["common"]); return ( - + {t("common:actions.edit")} @@ -491,16 +493,16 @@ function PostExpandableText({ return (
-
{text}
+
{text}
{isExpandable ? ( ) : null} - {!isExpanded ?
: null} + {!isExpanded ?
: null}
); } diff --git a/app/features/lfg/routes/lfg.tsx b/app/features/lfg/routes/lfg.tsx index 43f7dbfcc..846b33151 100644 --- a/app/features/lfg/routes/lfg.tsx +++ b/app/features/lfg/routes/lfg.tsx @@ -28,8 +28,6 @@ import { action } from "../actions/lfg.server"; import { loader } from "../loaders/lfg.server"; export { loader, action }; -import "../lfg.css"; - export const handle: SendouRouteHandle = { i18n: ["lfg"], breadcrumb: () => ({