diff --git a/packages/website/src/components/NavbarMobile.astro b/packages/website/src/components/NavbarCourse.astro similarity index 95% rename from packages/website/src/components/NavbarMobile.astro rename to packages/website/src/components/NavbarCourse.astro index 46d1c65c1..5fb96115c 100644 --- a/packages/website/src/components/NavbarMobile.astro +++ b/packages/website/src/components/NavbarCourse.astro @@ -4,13 +4,12 @@ import { CaretUpIcon, GearIcon } from "@radix-ui/react-icons"; import { api } from "../api/dynamic"; import { Logo } from "../icons/Logo"; import { LinkI18nWrapper } from "./LinkI18nWrapper"; -import type { Props as NavbarDesktopProps } from "./NavbarDesktop.astro"; -import { filtered } from "./NavbarDesktop.astro"; +import { filtered, type Props as NavbarFineProps } from "./NavbarFine.astro"; import NavbarMobileAutoHide from "./NavbarMobileAutoHide.astro"; import { Scroller, ScrollerOrientation } from "./Scroller"; import { Text } from "./Text"; -export type Props = NavbarDesktopProps & { +export type Props = NavbarFineProps & { solid?: boolean; }; @@ -27,13 +26,13 @@ const strings = await api.strings(locale); } #navbar-mobile-spacer { - display: none; flex-shrink: 0; + display: none; height: calc(var(--icon-size) + 2 * var(--padding)); - @media screen and (max-width: 80rem) { - display: block; + @media (pointer: coarse) { + display: flex; } } @@ -59,7 +58,7 @@ const strings = await api.strings(locale); flex-direction: column; justify-content: flex-end; - @media screen and (max-width: 80rem) { + @media (pointer: coarse) { display: flex; } diff --git a/packages/website/src/components/NavbarDesktop.astro b/packages/website/src/components/NavbarFine.astro similarity index 98% rename from packages/website/src/components/NavbarDesktop.astro rename to packages/website/src/components/NavbarFine.astro index db95b6c54..4719653ce 100644 --- a/packages/website/src/components/NavbarDesktop.astro +++ b/packages/website/src/components/NavbarFine.astro @@ -27,8 +27,10 @@ export const filtered = Object.values(tools).filter( --padding: var(--space-4); --min-content-width: calc(var(--icon-size) + 2 * var(--padding)); - @media screen and (max-width: 80rem) { - display: none; + display: none; + + @media (pointer: fine) { + display: block; } width: var(--min-content-width); diff --git a/packages/website/src/components/TankopediaSandbox/index.module.css b/packages/website/src/components/TankopediaSandbox/index.module.css index ef57462d8..5d8472ad7 100644 --- a/packages/website/src/components/TankopediaSandbox/index.module.css +++ b/packages/website/src/components/TankopediaSandbox/index.module.css @@ -10,10 +10,8 @@ height: 100%; background-color: black; - border-radius: var(--space-4); - - @media screen and (max-width: 80rem) { - border-radius: 0; + @media (pointer: fine) { + border-radius: var(--space-4); } } } diff --git a/packages/website/src/components/TankopediaTabs/index.module.css b/packages/website/src/components/TankopediaTabs/index.module.css index b823f2ea7..299496e3d 100644 --- a/packages/website/src/components/TankopediaTabs/index.module.css +++ b/packages/website/src/components/TankopediaTabs/index.module.css @@ -7,7 +7,7 @@ display: none; - @media screen and (max-width: 80rem) { + @media (pointer: coarse) { display: flex; } } diff --git a/packages/website/src/components/ToolBanner.astro b/packages/website/src/components/ToolBanner.astro index 40109582a..f1da16fcd 100644 --- a/packages/website/src/components/ToolBanner.astro +++ b/packages/website/src/components/ToolBanner.astro @@ -21,16 +21,13 @@ const toolStrings = strings.tools[tool.id as keyof typeof strings.tools]; --margin: var(--space-4); flex: 1; - border-radius: var(--space-4); overflow: hidden; - margin: var(--margin) var(--margin) 0 0; - background-size: cover; - @media screen and (max-width: 80rem) { - margin: 0; - border-radius: 0; + @media (pointer: fine) { + margin: var(--margin) var(--margin) 0 0; + border-radius: var(--space-4); } .content { diff --git a/packages/website/src/layouts/BaseLayout.astro b/packages/website/src/layouts/BaseLayout.astro index 49d05dc2f..e74256559 100644 --- a/packages/website/src/layouts/BaseLayout.astro +++ b/packages/website/src/layouts/BaseLayout.astro @@ -3,8 +3,8 @@ import BaseMeta from "../components/BaseMeta.astro"; import BaseStyles from "../components/BaseStyles.astro"; import ColorAlias from "../components/ColorAlias.astro"; import ColorScale from "../components/ColorScale.astro"; -import NavbarDesktop from "../components/NavbarDesktop.astro"; -import NavbarMobile from "../components/NavbarMobile.astro"; +import NavbarCourse from "../components/NavbarCourse.astro"; +import NavbarFine from "../components/NavbarFine.astro"; import SystemTheme from "../components/SystemTheme.astro"; import { tools } from "../constants/tools"; import type { LocaleAcceptorProps } from "../hooks/useLocale"; @@ -53,7 +53,11 @@ const tool = tools.tanks; min-height: 100dvh; display: flex; - flex-direction: row-reverse; + flex-direction: column; + + @media (pointer: fine) { + flex-direction: row-reverse; + } background-color: var(--gray-1); color: var(--gray-12); @@ -66,10 +70,6 @@ const tool = tools.tanks; display: flex; flex-direction: column; } - - @media screen and (max-width: 80rem) { - flex-direction: column; - } } @@ -79,7 +79,7 @@ const tool = tools.tanks; - - + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.module.css index c93458422..799609bfb 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.module.css +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.module.css @@ -6,7 +6,7 @@ padding: var(--space-4); padding-left: 0; - @media screen and (max-width: 80rem) { + @media (pointer: coarse) { padding-left: var(--space-4); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.module.css index 5ecb6c124..2d84c4ed7 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.module.css +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.module.css @@ -7,10 +7,8 @@ .sandbox { flex-grow: 1; - padding-top: var(--space-4); - - @media screen and (max-width: 80rem) { - padding-top: 0; + @media (pointer: fine) { + padding-top: var(--space-4); } } @@ -34,7 +32,7 @@ } } - @media screen and (max-width: 80rem) { + @media (pointer: coarse) { .sandbox, .loadout { &[data-tabbed="false"] {