Merge branch 'dev' into dev

This commit is contained in:
mrjvs 2024-01-30 20:40:28 +01:00 committed by GitHub
commit 3805329339
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 18 deletions

View File

@ -58,22 +58,7 @@ export function OnboardingPage() {
{t("onboarding.start.explainer")}
</Paragraph>
<div className="w-full flex flex-col-reverse md:flex-row gap-3">
<Card onClick={() => navigate("/onboarding/proxy")}>
<CardContent
colorClass="!text-onboarding-good"
title={t("onboarding.start.options.proxy.title")}
subtitle={t("onboarding.start.options.proxy.quality")}
description={t("onboarding.start.options.proxy.description")}
>
<Link>{t("onboarding.start.options.proxy.action")}</Link>
</CardContent>
</Card>
<div className="hidden md:grid grid-rows-[1fr,auto,1fr] justify-center gap-4">
<VerticalLine className="items-end" />
<span className="text-xs uppercase font-bold">or</span>
<VerticalLine />
</div>
<div className="w-full flex flex-col md:flex-row gap-3">
<Card onClick={() => navigate("/onboarding/extension")}>
<CardContent
colorClass="!text-onboarding-best"
@ -84,6 +69,21 @@ export function OnboardingPage() {
<Link>{t("onboarding.start.options.extension.action")}</Link>
</CardContent>
</Card>
<div className="hidden md:grid grid-rows-[1fr,auto,1fr] justify-center gap-4">
<VerticalLine className="items-end" />
<span className="text-xs uppercase font-bold">or</span>
<VerticalLine />
</div>
<Card onClick={() => navigate("/onboarding/proxy")}>
<CardContent
colorClass="!text-onboarding-good"
title={t("onboarding.start.options.proxy.title")}
subtitle={t("onboarding.start.options.proxy.quality")}
description={t("onboarding.start.options.proxy.description")}
>
<Link>{t("onboarding.start.options.proxy.action")}</Link>
</CardContent>
</Card>
</div>
<p className="text-center hidden md:block mt-12">

View File

@ -155,7 +155,7 @@ export function SetupPart() {
return (
<SettingsCard>
<div className="flex items-start gap-4">
<div className="flex flex-col md:flex-row items-start gap-4">
<div>
<div
className={classNames({
@ -193,7 +193,7 @@ export function SetupPart() {
{t("settings.connections.setup.items.default")}
</SetupCheckList>
</div>
<div className="mt-5">
<div className="md:mt-5">
<Button theme="purple" onClick={() => navigate("/onboarding")}>
{t(textLookupMap[globalState].button)}
</Button>