Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Remove `mt?` attribute from form and button components (#6736)
Sanne de Vries2e385f14c995
diff --git a/extra/lib/plausible_web/live/customer_support/email_suppressions.ex b/extra/lib/plausible_web/live/customer_support/email_suppressions.exindex 798076b5e0..1471e3f253 100644--- a/extra/lib/plausible_web/live/customer_support/email_suppressions.ex+++ b/extra/lib/plausible_web/live/customer_support/email_suppressions.ex@@ -134,7 +134,6 @@ defmodule PlausibleWeb.Live.CustomerSupport.EmailSuppressions do:if={is_nil(s.reactivated_at) and s.reason != :spam_complaint}theme="ghost"size="sm"- mt?={false}phx-click="reactivate"phx-value-email={s.email}data-confirm={"Reactivate #{s.email}? Plausible will start sending mail to this address again."}diff --git a/extra/lib/plausible_web/live/customer_support/site/components/overview.ex b/extra/lib/plausible_web/live/customer_support/site/components/overview.exindex 6b74fdd4a1..dff5d5a79d 100644--- a/extra/lib/plausible_web/live/customer_support/site/components/overview.ex+++ b/extra/lib/plausible_web/live/customer_support/site/components/overview.ex@@ -46,20 +46,26 @@ defmodule PlausibleWeb.CustomerSupport.Site.Components.Overview dolabel="Timezone"options={Plausible.Timezones.options()}/>- <.input type="checkbox" field={f[:public]} label="Public?" />- <.input type="datetime-local" field={f[:native_stats_start_at]} label="Native Stats Start At" />- <.input- type="text"- field={f[:ingest_rate_limit_threshold]}- label="Ingest Rate Limit Threshold"- />- <.input- type="text"- field={f[:ingest_rate_limit_scale_seconds]}- label="Ingest Rate Limit Scale Seconds"- />+ <.input type="checkbox" field={f[:public]} label="Public?" wrapper_class="mt-2" />+ <div class="flex flex-col gap-6 mt-6">+ <.input+ type="datetime-local"+ field={f[:native_stats_start_at]}+ label="Native Stats Start At"+ />+ <.input+ type="text"+ field={f[:ingest_rate_limit_threshold]}+ label="Ingest Rate Limit Threshold"+ />+ <.input+ type="text"+ field={f[:ingest_rate_limit_scale_seconds]}+ label="Ingest Rate Limit Scale Seconds"+ />+ </div>- <div class="flex justify-between">+ <div class="flex justify-between mt-6"><.button phx-target={@myself} type="submit">Save</.button>diff --git a/extra/lib/plausible_web/live/customer_support/site/components/rescue_zone.ex b/extra/lib/plausible_web/live/customer_support/site/components/rescue_zone.exindex 31e7dcc4ea..173b474ec6 100644--- a/extra/lib/plausible_web/live/customer_support/site/components/rescue_zone.ex+++ b/extra/lib/plausible_web/live/customer_support/site/components/rescue_zone.ex@@ -45,7 +45,7 @@ defmodule PlausibleWeb.CustomerSupport.Site.Components.RescueZone dosuggest_fun={fn input, _ -> search_email(input) end}creatable/>- <.button phx-target={@myself} type="submit">+ <.button phx-target={@myself} type="submit" class="mt-6">Initiate Site Transfer</.button></form>diff --git a/extra/lib/plausible_web/live/customer_support/team/components/audit.ex b/extra/lib/plausible_web/live/customer_support/team/components/audit.exindex b6a700fdc6..49d64797b8 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/audit.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/audit.ex@@ -44,7 +44,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Audit dolabel="Audit Entry Identifier"value={@revealed_audit_entry_id}/>- <div class="relative">+ <div class="relative mt-6"><.inputrows="16"type="textarea"@@ -121,7 +121,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Audit dois_nil(@revealed_audit_entry_id) &&(@audit_page.metadata.before || @audit_page.metadata.after)}- class="flex justify-between items-center mt-4"+ class="flex justify-between items-center mt-10"><.button:if={@audit_page.metadata.before}diff --git a/extra/lib/plausible_web/live/customer_support/team/components/billing.ex b/extra/lib/plausible_web/live/customer_support/team/components/billing.exindex 93d96acf01..cdbdebacf0 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/billing.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/billing.ex@@ -63,7 +63,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Billing doid="new-custom-plan"phx-click="show-plan-form"phx-target={@myself}- class="ml-auto"+ class="ml-auto mt-6">New Custom Plan</.button>@@ -194,70 +194,74 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Billing dophx-target={@myself}phx-change="estimate-cost">- <.input- field={f[:paddle_plan_id]}- label="Paddle Plan ID"- autocomplete="off"- readonly={not is_nil(@editing_plan)}- />- <.input- type="select"- options={["monthly", "yearly"]}- field={f[:billing_interval]}- label="Billing Interval"- autocomplete="off"- />-- <div class="flex items-center gap-x-4">+ <div class="flex flex-col gap-6 mt-6"><.input- field={f[:monthly_pageview_limit]}- label="Monthly Pageview Limit"+ field={f[:paddle_plan_id]}+ label="Paddle Plan ID"autocomplete="off"- width="w-[500]"+ readonly={not is_nil(@editing_plan)}/>- <.preview for={f[:monthly_pageview_limit]} />- </div>-- <div class="flex items-center gap-x-4">- <.input width="w-[500]" field={f[:site_limit]} label="Site Limit" autocomplete="off" />- <.preview for={f[:site_limit]} />- </div>-- <div class="flex items-center gap-x-4"><.input- field={f[:team_member_limit]}- label="Team Member Limit"+ type="select"+ options={["monthly", "yearly"]}+ field={f[:billing_interval]}+ label="Billing Interval"autocomplete="off"- width="w-[500]"/>- <.preview for={f[:team_member_limit]} />++ <div class="flex items-center gap-x-4">+ <.input+ field={f[:monthly_pageview_limit]}+ label="Monthly Pageview Limit"+ autocomplete="off"+ width="w-[500]"+ />+ <.preview for={f[:monthly_pageview_limit]} />+ </div>++ <div class="flex items-center gap-x-4">+ <.input width="w-[500]" field={f[:site_limit]} label="Site Limit" autocomplete="off" />+ <.preview for={f[:site_limit]} />+ </div>++ <div class="flex items-center gap-x-4">+ <.input+ field={f[:team_member_limit]}+ label="Team Member Limit"+ autocomplete="off"+ width="w-[500]"+ />+ <.preview for={f[:team_member_limit]} />+ </div>++ <div class="flex items-center gap-x-4">+ <.input+ field={f[:hourly_api_request_limit]}+ label="Hourly API Request Limit"+ autocomplete="off"+ width="w-[500]"+ />+ <.preview for={f[:hourly_api_request_limit]} />+ </div></div>- <div class="flex items-center gap-x-4">+ <div class="flex flex-col gap-2 mt-2"><.input- field={f[:hourly_api_request_limit]}- label="Hourly API Request Limit"- autocomplete="off"- width="w-[500]"+ :for={+ mod <-+ Plausible.Billing.Feature.list()+ |> Enum.sort_by(fn item -> if item.name() == :stats_api, do: 0, else: 1 end)+ }+ :if={mod not in Teams.Billing.free_features()}+ x-on:change="featureChangeCallback(event)"+ type="checkbox"+ value={mod in (f.source.changes[:features] || f.source.data.features || [])}+ name={"#{f.name}[features[]][#{mod.name()}]"}+ label={mod.display_name()}/>- <.preview for={f[:hourly_api_request_limit]} /></div>- <.input- :for={- mod <-- Plausible.Billing.Feature.list()- |> Enum.sort_by(fn item -> if item.name() == :stats_api, do: 0, else: 1 end)- }- :if={mod not in Teams.Billing.free_features()}- x-on:change="featureChangeCallback(event)"- type="checkbox"- value={mod in (f.source.changes[:features] || f.source.data.features || [])}- name={"#{f.name}[features[]][#{mod.name()}]"}- label={mod.display_name()}- />-- <div class="mt-8 flex align-center gap-x-4">+ <div class="mt-10 flex align-center gap-x-4"><.inputtype="checkbox"field={f[:managed_proxy_price_modifier]}@@ -273,11 +277,11 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Billing dovalue={@cost_estimate}/>- <.button theme="secondary" phx-click="hide-plan-form" phx-target={@myself}>+ <.button theme="secondary" phx-click="hide-plan-form" phx-target={@myself} class="mt-6">Cancel</.button>- <.button type="submit">+ <.button type="submit" class="mt-6">{if @editing_plan, do: "Update Plan", else: "Save Custom Plan"}</.button></div>diff --git a/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex b/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.exindex e8d35ac43a..c894f9706c 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex@@ -36,7 +36,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.ConsolidatedViews do<%= if Enum.empty?(@consolidated_views) do %><div class="mx-auto flex flex-col items-center"><p>This team does not have a consolidated view yet.</p>- <.button class="mx-auto" phx-click="create-consolidated-view" phx-target={@myself}>+ <.button class="mx-auto mt-6" phx-click="create-consolidated-view" phx-target={@myself}>Create one</.button></div>diff --git a/extra/lib/plausible_web/live/customer_support/team/components/members.ex b/extra/lib/plausible_web/live/customer_support/team/components/members.exindex 603654a482..a7179cbed7 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/members.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/members.ex@@ -57,7 +57,6 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Members dotheme="ghost"size="sm"icon?={true}- mt?={false}class="btn-text-danger"phx-click="deprovision-sso-user"phx-value-identifier={member.id}diff --git a/extra/lib/plausible_web/live/customer_support/team/components/overview.ex b/extra/lib/plausible_web/live/customer_support/team/components/overview.exindex 82b3fcbb63..98a738c95c 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/overview.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/overview.ex@@ -28,17 +28,28 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Overview do/><.form :let={f} for={@form} phx-submit="save-team" phx-target={@myself}>- <.input field={f[:trial_expiry_date]} type="date" label="Trial Expiry Date" />- <.input field={f[:accept_traffic_until]} type="date" label="Accept traffic Until" />+ <.input+ field={f[:trial_expiry_date]}+ type="date"+ label="Trial Expiry Date"+ wrapper_class="mt-6"+ />+ <.input+ field={f[:accept_traffic_until]}+ type="date"+ label="Accept traffic Until"+ wrapper_class="mt-6"+ /><.inputtype="checkbox"field={f[:allow_next_upgrade_override]}label="Allow Next Upgrade Override"+ wrapper_class="mt-2"/>- <.input type="textarea" field={f[:notes]} label="Notes" />+ <.input type="textarea" field={f[:notes]} label="Notes" wrapper_class="mt-6" />- <div class="flex justify-between">+ <div class="flex justify-between mt-6"><.button type="submit">Save</.button>@@ -74,7 +85,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Overview do</p><.button- class="mt-2"+ class="mt-6"phx-click="unsnooze-schedule"phx-target={@myself}data-confirm="Resume the deletion schedule now? This restarts the notice cycle."@@ -89,7 +100,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Overview dofor={@snooze_form}phx-submit="snooze-schedule"phx-target={@myself}- class="mt-3 flex items-end gap-x-4"+ class="mt-9 flex items-end gap-x-4"><.input field={f[:snoozed_until]} type="date" label="Snooze until" /><.input field={f[:snooze_note]} type="text" label="Note (optional)" />diff --git a/extra/lib/plausible_web/live/customer_support/team/components/sso.ex b/extra/lib/plausible_web/live/customer_support/team/components/sso.exindex 2a0b374ef3..84ed79efb0 100644--- a/extra/lib/plausible_web/live/customer_support/team/components/sso.ex+++ b/extra/lib/plausible_web/live/customer_support/team/components/sso.ex@@ -68,6 +68,7 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.SSO dophx-click="remove-sso-integration"phx-target={@myself}theme="danger"+ class="mt-6">Remove Integration</.button>diff --git a/extra/lib/plausible_web/live/customer_support/user/components/overview.ex b/extra/lib/plausible_web/live/customer_support/user/components/overview.exindex 1b7f7b8526..aef5c648e7 100644--- a/extra/lib/plausible_web/live/customer_support/user/components/overview.ex+++ b/extra/lib/plausible_web/live/customer_support/user/components/overview.ex@@ -48,7 +48,7 @@ defmodule PlausibleWeb.CustomerSupport.User.Components.Overview do<.form :let={f} for={@form} phx-target={@myself} phx-submit="save-user" class="mt-8"><.input type="textarea" field={f[:notes]} label="Notes" />- <div class="flex justify-between">+ <div class="flex justify-between mt-6"><div><.button phx-target={@myself} type="submit">Savediff --git a/extra/lib/plausible_web/live/funnel_settings.ex b/extra/lib/plausible_web/live/funnel_settings.exindex 9318f05e61..8255cd75cc 100644--- a/extra/lib/plausible_web/live/funnel_settings.ex+++ b/extra/lib/plausible_web/live/funnel_settings.ex@@ -98,7 +98,7 @@ defmodule PlausibleWeb.Live.FunnelSettings dofirst, then return here to build your first funnel.</p><.button_link- class="mt-4"+ class="mt-6"href={~p"/#{@domain}/settings/goals"}>Set up goals →diff --git a/extra/lib/plausible_web/live/funnel_settings/form.ex b/extra/lib/plausible_web/live/funnel_settings/form.exindex f4fd262170..de4450c71e 100644--- a/extra/lib/plausible_web/live/funnel_settings/form.ex+++ b/extra/lib/plausible_web/live/funnel_settings/form.ex@@ -189,7 +189,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do<.buttonid="save"type="submit"- class="w-full"+ class="w-full mt-6"disabled={has_steps_errors?(f) or map_size(@selections_made) < Funnel.min_steps() orlength(@step_ids) > map_size(@selections_made)diff --git a/extra/lib/plausible_web/live/funnel_settings/list.ex b/extra/lib/plausible_web/live/funnel_settings/list.exindex 1968edd485..f73b07bdc2 100644--- a/extra/lib/plausible_web/live/funnel_settings/list.ex+++ b/extra/lib/plausible_web/live/funnel_settings/list.ex@@ -16,7 +16,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.List do<div class="flex flex-col gap-4 sm:gap-6"><%= if @searching? or Enum.count(@funnels) > 0 do %><.filter_bar filter_text={@filter_text} placeholder="Search Funnels">- <.button id="add-funnel-button" phx-click="add-funnel" mt?={false}>+ <.button id="add-funnel-button" phx-click="add-funnel">Add funnel</.button></.filter_bar>@@ -78,7 +78,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.List do<.buttonid="add-funnel-button"phx-click="add-funnel"- class="mt-4"+ class="mt-6">Add funnel</.button>diff --git a/extra/lib/plausible_web/live/sso_management.ex b/extra/lib/plausible_web/live/sso_management.exindex 41536561eb..cbb6f9979c 100644--- a/extra/lib/plausible_web/live/sso_management.ex+++ b/extra/lib/plausible_web/live/sso_management.ex@@ -79,7 +79,7 @@ defmodule PlausibleWeb.Live.SSOManagement doSingle Sign-On (SSO) enables team members to sign in without having to register an account. For more details, <.styled_link href="https://plausible.io/docs/sso">see our documentation</.styled_link>.</p>- <.button type="submit">Start Configuring SSO</.button>+ <.button type="submit" class="mt-6">Start Configuring SSO</.button></form>"""end@@ -120,7 +120,7 @@ defmodule PlausibleWeb.Live.SSOManagement do<form id="sso-idp-form" for={} phx-submit="show-idp-form"><p class="text-sm">Click below to start setting up Single Sign-On for your team.</p>- <.button type="submit">Start Configuring</.button>+ <.button type="submit" class="mt-6">Start Configuring</.button></form></div>"""@@ -137,7 +137,7 @@ defmodule PlausibleWeb.Live.SSOManagement do:let={f}id="sso-idp-config"for={@config_changeset}- class="flex-col space-y-4"+ class="flex flex-col gap-6"phx-submit="update-integration"><.input@@ -154,7 +154,7 @@ defmodule PlausibleWeb.Live.SSOManagement do<.input field={f[:idp_cert_pem]} type="textarea" label="Signing Certificate in PEM format" />- <.button type="submit">Save</.button>+ <.button type="submit" class="self-start mt-4">Save</.button></.form></div>"""@@ -176,7 +176,7 @@ defmodule PlausibleWeb.Live.SSOManagement do><.input field={f[:domain]} label="Domain" placeholder="example.com" />- <.button type="submit">Add Domain</.button>+ <.button type="submit" class="mt-6">Add Domain</.button></.form></div>"""@@ -225,11 +225,14 @@ defmodule PlausibleWeb.Live.SSOManagement do<.button:if={@domain.status in [Status.in_progress(), Status.unverified(), Status.verified()]}type="submit"+ class="mt-6">Run Verification Now</.button>- <.button :if={@domain.status == Status.pending()} type="submit">Continue</.button>+ <.button :if={@domain.status == Status.pending()} type="submit" class="mt-6">+ Continue+ </.button></form></div>"""@@ -281,7 +284,7 @@ defmodule PlausibleWeb.Live.SSOManagement doCurrent Identity Provider configuration:</p>- <.form :let={f} id="sso-idp-config" for={} class="flex-col space-y-4">+ <.form :let={f} id="sso-idp-config" for={} class="flex flex-col gap-6 mt-6"><.inputfield={f[:idp_signin_url]}value={@integration.config.idp_signin_url}@@ -306,7 +309,7 @@ defmodule PlausibleWeb.Live.SSOManagement do</.form><form id="show-idp-form" for={} phx-submit="show-idp-form">- <.button type="submit">Edit</.button>+ <.button type="submit" class="mt-6">Edit</.button></form></div></div>@@ -373,7 +376,7 @@ defmodule PlausibleWeb.Live.SSOManagement do</.table><form id="show-domain-setup" for={} phx-submit="show-domain-setup">- <.button type="submit">Add Domain</.button>+ <.button type="submit" class="mt-6">Add Domain</.button></form></div></.tile>@@ -423,7 +426,7 @@ defmodule PlausibleWeb.Live.SSOManagement do:let={f}id="sso-policy"for={@policy_changeset}- class="flex-col space-y-4"+ class="flex flex-col gap-6 mt-6"phx-submit="update-policy"><.input@@ -439,7 +442,7 @@ defmodule PlausibleWeb.Live.SSOManagement dotype="number"/>- <.button type="submit">Update</.button>+ <.button type="submit" class="self-start mt-4">Update</.button></.form></div></.tile>diff --git a/extra/lib/plausible_web/templates/sso/login_form.html.heex b/extra/lib/plausible_web/templates/sso/login_form.html.heexindex 2446340437..86d233e13a 100644--- a/extra/lib/plausible_web/templates/sso/login_form.html.heex+++ b/extra/lib/plausible_web/templates/sso/login_form.html.heex@@ -23,7 +23,6 @@autocomplete="username"placeholder="[email protected]"field={f[:email]}- mt?={false}autofocus="autofocus"/></div>@@ -38,7 +37,7 @@<input type="hidden" name="return_to" value={@conn.params["return_to"]} /><div class="flex flex-col gap-y-4">- <.button class="w-full" type="submit" mt?={false}>Sign in</.button>+ <.button class="w-full" type="submit">Sign in</.button><p class="text-sm text-center text-gray-500 dark:text-gray-400"><.styled_link href={diff --git a/extra/lib/plausible_web/templates/sso/saml_signin.html.heex b/extra/lib/plausible_web/templates/sso/saml_signin.html.heexindex 7941a5368c..51a8d77311 100644--- a/extra/lib/plausible_web/templates/sso/saml_signin.html.heex+++ b/extra/lib/plausible_web/templates/sso/saml_signin.html.heex@@ -29,7 +29,7 @@<.input type="hidden" field={f[:email]} /><.input type="hidden" field={f[:return_to]} />- <.button class="w-full" type="submit">sign in</.button>+ <.button class="w-full mt-6" type="submit">sign in</.button></.form></div></body>diff --git a/lib/plausible_web/components/billing/notice.ex b/lib/plausible_web/components/billing/notice.exindex 9feff0470a..be884ac8bf 100644--- a/lib/plausible_web/components/billing/notice.ex+++ b/lib/plausible_web/components/billing/notice.ex@@ -267,13 +267,12 @@ defmodule PlausibleWeb.Components.Billing.Notice doNo action is required. Occasional traffic spikes are normal, and we'll keep tracking your stats as usual. Upgrading now gives you room to grow if higher traffic continues.</p><div class="flex gap-3 items-center">- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link><.button_linkhref="https://plausible.io/docs/subscription-plans"theme="secondary"- mt?={false}>Learn more</.button_link>@@ -290,7 +289,7 @@ defmodule PlausibleWeb.Components.Billing.Notice do<p class="text-pretty">Upgrading lets you add more as your team grows.</p>- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link></div>@@ -305,7 +304,7 @@ defmodule PlausibleWeb.Components.Billing.Notice do<p class="text-pretty">Upgrading lets you add more sites as you grow.</p>- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link></div>@@ -324,7 +323,7 @@ defmodule PlausibleWeb.Components.Billing.Notice do<p class="text-pretty">Upgrading gives you room to grow.</p>- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link></div>@@ -340,13 +339,12 @@ defmodule PlausibleWeb.Components.Billing.Notice doNo action is required. Occasional traffic spikes are normal, but upgrading now gives you room to grow if higher traffic continues.</p><div class="flex gap-3 items-center">- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link><.button_linkhref="https://plausible.io/docs/subscription-plans"theme="secondary"- mt?={false}>Learn more</.button_link>@@ -364,13 +362,12 @@ defmodule PlausibleWeb.Components.Billing.Notice doNo action is required. Occasional traffic spikes are normal, but upgrading now gives you room to grow if higher traffic continues.</p><div class="flex gap-3 items-center">- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link><.button_linkhref="https://plausible.io/docs/subscription-plans"theme="secondary"- mt?={false}>Learn more</.button_link>@@ -388,13 +385,12 @@ defmodule PlausibleWeb.Components.Billing.Notice doTo ensure uninterrupted access to your stats, please upgrade to a plan that fits your current usage.</p><div class="flex gap-3 items-center">- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link><.button_linkhref="https://plausible.io/docs/subscription-plans"theme="secondary"- mt?={false}>Learn more</.button_link>@@ -432,13 +428,12 @@ defmodule PlausibleWeb.Components.Billing.Notice doTo ensure uninterrupted access to your stats, please upgrade to a plan that fits your current usage {@deadline_text}.</p><div class="flex gap-3 items-center">- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link><.button_linkhref="https://plausible.io/docs/subscription-plans"theme="secondary"- mt?={false}>Learn more</.button_link>@@ -456,13 +451,12 @@ defmodule PlausibleWeb.Components.Billing.Notice doYour stats are still being tracked, but dashboard access is temporarily locked because your site exceeded your plan's pageview limit for two consecutive billing cycles. Upgrade to restore access.</p><div class="flex gap-3 items-center">- <.button_link href={~p"/billing/choose-plan"} mt?={false}>+ <.button_link href={~p"/billing/choose-plan"}>Upgrade</.button_link><.button_linkhref="https://plausible.io/docs/subscription-plans"theme="secondary"- mt?={false}>Learn more</.button_link>@@ -482,7 +476,6 @@ defmodule PlausibleWeb.Components.Billing.Notice do<.button_linkid="upgrade-or-change-plan-link"href={~p"/billing/choose-plan"}- mt?={false}>Choose a plan</.button_link>diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.exindex 7e195ab592..8a2797ebcc 100644--- a/lib/plausible_web/components/generic.ex+++ b/lib/plausible_web/components/generic.ex@@ -86,7 +86,6 @@ defmodule PlausibleWeb.Components.Generic doattr(:icon?, :boolean, default: false)attr(:class, :string, default: "")attr(:disabled, :boolean, default: false)- attr(:mt?, :boolean, default: true)attr(:rest, :global, include: ~w(name))slot(:inner_block)@@ -105,7 +104,6 @@ defmodule PlausibleWeb.Components.Generic dotype={@type}disabled={@disabled}class={[- @mt? && "mt-6",@button_base_class,@size_class,@theme_class,@@ -126,7 +124,6 @@ defmodule PlausibleWeb.Components.Generic doattr(:icon?, :boolean, default: false)attr(:disabled, :boolean, default: false)attr(:method, :string, default: "get")- attr(:mt?, :boolean, default: true)attr(:rest, :global)slot(:inner_block)@@ -173,7 +170,6 @@ defmodule PlausibleWeb.Components.Generic dohref={@href}onclick={@onclick}class={[- @mt? && "mt-6",@button_base_class,@size_class,@theme_class,@@ -370,7 +366,6 @@ defmodule PlausibleWeb.Components.Generic dox-on:click="toggle()"theme={@button_theme}size={@button_size}- mt?={false}class={@button_class}>{render_slot(@button)}@@ -627,7 +622,6 @@ defmodule PlausibleWeb.Components.Generic doattr :label, :string, required: trueattr :help_text, :string, default: nilattr :show_help_text_only_when_active?, :boolean, default: false- attr :mt?, :boolean, default: trueattr(:rest, :global)@@ -640,7 +634,7 @@ defmodule PlausibleWeb.Components.Generic do"""def toggle_field(assigns) do~H"""- <div class={["flex items-start justify-between gap-5 w-full", @mt? && "mt-6"]}>+ <div class="flex items-start justify-between gap-5 w-full"><div class="flex-1"><spanx-on:click={"#{@js_active_var} = !#{@js_active_var}"}@@ -1041,7 +1035,6 @@ defmodule PlausibleWeb.Components.Generic dotheme="ghost"size="sm"icon?={true}- mt?={false}class={"btn-text-primary #{@class}"}{@rest}>@@ -1062,7 +1055,6 @@ defmodule PlausibleWeb.Components.Generic dotheme="ghost"size="sm"icon?={true}- mt?={false}class={"btn-text-danger #{@class}"}{@rest}>@@ -1073,7 +1065,6 @@ defmodule PlausibleWeb.Components.Generic dotheme="ghost"size="sm"icon?={true}- mt?={false}class={"btn-text-danger #{@class}"}{@rest}>diff --git a/lib/plausible_web/components/google.ex b/lib/plausible_web/components/google.exindex 61907f531e..914a6b9b95 100644--- a/lib/plausible_web/components/google.ex+++ b/lib/plausible_web/components/google.ex@@ -9,7 +9,7 @@ defmodule PlausibleWeb.Components.Google dodef button(assigns) do~H"""- <.button_link id={@id} href={@to} theme="secondary" mt?={false}>+ <.button_link id={@id} href={@to} theme="secondary"><.logo /> Continue with Google</.button_link>"""diff --git a/lib/plausible_web/components/layouts/header.html.heex b/lib/plausible_web/components/layouts/header.html.heexindex 3086bdbca7..c463509794 100644--- a/lib/plausible_web/components/layouts/header.html.heex+++ b/lib/plausible_web/components/layouts/header.html.heex@@ -137,11 +137,10 @@class="flex items-center gap-2"x-show="!document.cookie.includes('logged_in=true')">- <.button_link href="/login" theme="ghost" mt?={false}>Login</.button_link>+ <.button_link href="/login" theme="ghost">Login</.button_link><.button_link:if={Plausible.Auth.check_registration_enabled() == :ok}href="/register"- mt?={false}>Sign up</.button_link>diff --git a/lib/plausible_web/components/site/new_site_form.ex b/lib/plausible_web/components/site/new_site_form.exindex 32f02545db..e304271f4a 100644--- a/lib/plausible_web/components/site/new_site_form.ex+++ b/lib/plausible_web/components/site/new_site_form.ex@@ -32,7 +32,6 @@ defmodule PlausibleWeb.Components.Site.NewSiteForm dofield={f[:domain]}label="Domain"disabled={@site_limit_exceeded?}- mt?={false}autofocus="autofocus"/>@@ -47,13 +46,12 @@ defmodule PlausibleWeb.Components.Site.NewSiteForm do</script><div class="flex justify-end items-center gap-x-2">- <.button_link theme="ghost" href={@back_button_href} mt?={false}>+ <.button_link theme="ghost" href={@back_button_href}>{@back_button_text}</.button_link><.buttondisabled={@site_limit_exceeded?}type="submit"- mt?={false}class="disabled:cursor-not-allowed">Add sitediff --git a/lib/plausible_web/components/team/notice.ex b/lib/plausible_web/components/team/notice.exindex 8f552abb91..d2342af448 100644--- a/lib/plausible_web/components/team/notice.ex+++ b/lib/plausible_web/components/team/notice.ex@@ -83,7 +83,6 @@ defmodule PlausibleWeb.Team.Notice dotheme="ghost"size="sm"class="order-2 md:order-1"- mt?={false}>Reject</.button_link>@@ -93,7 +92,6 @@ defmodule PlausibleWeb.Team.Notice dotheme="secondary"size="sm"class="order-1 md:order-2"- mt?={false}>Accept</.button_link>@@ -165,7 +163,6 @@ defmodule PlausibleWeb.Team.Notice dotheme="ghost"size="sm"class="order-3 md:order-1"- mt?={false}>Reject</.button_link>@@ -176,7 +173,6 @@ defmodule PlausibleWeb.Team.Notice dotheme="secondary"size="sm"class="order-1 md:order-2"- mt?={false}>Accept</.button_link>@@ -217,7 +213,6 @@ defmodule PlausibleWeb.Team.Notice dotheme="secondary"size="sm"class="order-1 md:order-3"- mt?={false}>Upgrade to accept</.button_link>@@ -249,7 +244,6 @@ defmodule PlausibleWeb.Team.Notice dotheme="ghost"size="sm"class="order-2 md:order-1"- mt?={false}>Reject</.button_link>@@ -259,7 +253,6 @@ defmodule PlausibleWeb.Team.Notice dotheme="secondary"size="sm"class="order-1 md:order-2"- mt?={false}>Accept</.button_link>diff --git a/lib/plausible_web/components/two_factor.ex b/lib/plausible_web/components/two_factor.exindex abfcbed83e..e24c9d1946 100644--- a/lib/plausible_web/components/two_factor.ex+++ b/lib/plausible_web/components/two_factor.ex@@ -48,7 +48,6 @@ defmodule PlausibleWeb.Components.TwoFactor do:if={@show_button?}type="submit"id={@id}- mt?={false}class="w-full [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"><span class="label-enabled pointer-events-none">@@ -145,7 +144,7 @@ defmodule PlausibleWeb.Components.TwoFactor do<.buttontype="button"x-on:click={"#{@state_param} = false"}- class="w-full sm:w-auto mr-2"+ class="w-full sm:w-auto mr-2 mt-6"theme="secondary">Canceldiff --git a/lib/plausible_web/live/change_domain/form.ex b/lib/plausible_web/live/change_domain/form.exindex 20c2bcf326..0dedae66bf 100644--- a/lib/plausible_web/live/change_domain/form.ex+++ b/lib/plausible_web/live/change_domain/form.ex@@ -21,7 +21,7 @@ defmodule PlausibleWeb.Live.ChangeDomain.Form dodef render(assigns) do~H"""<div>- <.form :let={f} for={@changeset} phx-submit="submit" phx-target={@myself}>+ <.form :let={f} for={@changeset} phx-submit="submit" phx-target={@myself} class="mt-6"><.inputhelp_text="Just the naked domain or subdomain without 'www', 'https' etc."type="text"@@ -40,7 +40,7 @@ defmodule PlausibleWeb.Live.ChangeDomain.Form do</.styled_link></p>- <.button type="submit" class="mt-4 w-full">+ <.button type="submit" class="mt-6 w-full">Change Domain</.button></.form>diff --git a/lib/plausible_web/live/components/form.ex b/lib/plausible_web/live/components/form.exindex dbb3c2630d..017720116f 100644--- a/lib/plausible_web/live/components/form.ex+++ b/lib/plausible_web/live/components/form.ex@@ -53,8 +53,8 @@ defmodule PlausibleWeb.Live.Components.Form do)attr(:class, :any, default: "")+ attr(:wrapper_class, :any, default: nil)- attr(:mt?, :boolean, default: true)attr(:max_one_error, :boolean, default: false)attr(:resizable, :boolean, default: true)slot(:help_content)@@ -69,7 +69,6 @@ defmodule PlausibleWeb.Live.Components.Form dofield: nil,id: assigns.id || field.id,class: assigns.class,- mt?: assigns.mt?,width: assigns.width)|> assign(:errors, Enum.map(errors, &translate_error(&1)))@@ -83,7 +82,7 @@ defmodule PlausibleWeb.Live.Components.Form doassigns = assign(assigns, :class, [base, assigns.class])~H"""- <div class={@mt? && "mt-6"}>+ <div class={@wrapper_class}><.label :if={@label != nil and @label != ""} for={@id} class="mb-1.5">{@label}</.label>@@ -109,9 +108,7 @@ defmodule PlausibleWeb.Live.Components.Form doend)~H"""- <div class={[- @mt? && "mt-2"- ]}>+ <div class={@wrapper_class}><.labelfor={@id}class="font-normal gap-x-2 flex flex-inline items-center sm:justify-start justify-center "@@ -135,7 +132,8 @@ defmodule PlausibleWeb.Live.Components.Form dodef input(%{type: "radio"} = assigns) do~H"""<div class={[- "flex flex-inline justify-start gap-x-3"+ "flex flex-inline justify-start gap-x-3",+ @wrapper_class]}><inputtype="radio"@@ -165,7 +163,7 @@ defmodule PlausibleWeb.Live.Components.Form doassigns = assign(assigns, :class, [@multiline_input_class, assigns.class])~H"""- <div class={@mt? && "mt-6"}>+ <div class={@wrapper_class}><.label :if={@label != nil and @label != ""} class="mb-1.5" for={@id}>{@label}</.label><textareaid={@id}@@ -194,7 +192,7 @@ defmodule PlausibleWeb.Live.Components.Form do|> assign(:class, [@input_class, assigns.class])~H"""- <div class={@mt? && "mt-6"}>+ <div class={@wrapper_class}><.label :if={@label != nil and @label != ""} for={@id} class="mb-1.5">{@label}</.label>@@ -241,7 +239,6 @@ defmodule PlausibleWeb.Live.Components.Form do</div><div class="relative"><.input- mt?={false}id={@id}name={@name}value={@value}@@ -270,8 +267,8 @@ defmodule PlausibleWeb.Live.Components.Form do"""attr(:id, :any, default: nil)attr(:label, :string, default: nil)- attr(:mt?, :boolean, default: true)attr(:autocomplete, :string, default: "current-password")+ attr(:wrapper_class, :any, default: nil)attr(:field, Phoenix.HTML.FormField, required: true)@@ -286,7 +283,7 @@ defmodule PlausibleWeb.Live.Components.Form doassigns = assign(assigns, :class, "pr-10")~H"""- <div x-data="{ showPassword: false }">+ <div x-data="{ showPassword: false }" class={@wrapper_class}><.inputtype="password"x-bind:type="showPassword ? 'text' : 'password'"@@ -294,7 +291,6 @@ defmodule PlausibleWeb.Live.Components.Form dolabel={@label}id={@id}autocomplete={@autocomplete}- mt?={@mt?}class={@class}{@rest}>@@ -367,7 +363,7 @@ defmodule PlausibleWeb.Live.Components.Form doattr(:id, :any, default: nil)attr(:label, :string, default: nil)- attr(:mt?, :boolean, default: true)+ attr(:wrapper_class, :any, default: nil)attr(:field, Phoenix.HTML.FormField,doc: "a form field struct retrieved from the form, for example: @form[:password]",@@ -414,7 +410,7 @@ defmodule PlausibleWeb.Live.Components.Form doautocomplete="new-password"label={@label}id={@id}- mt?={@mt?}+ wrapper_class={@wrapper_class}{@rest}><.strength_meter :if={@show_meter?} {@strength} />@@ -575,7 +571,6 @@ defmodule PlausibleWeb.Live.Components.Form dotype="select"options={@options}onchange={"if (event.target.value) { location.href = '#{@href_base}' + event.target.value }"}- mt?={false}/></.form>"""diff --git a/lib/plausible_web/live/components/verification_banner.ex b/lib/plausible_web/live/components/verification_banner.exindex 6083eb5aea..61a21a8a49 100644--- a/lib/plausible_web/live/components/verification_banner.ex+++ b/lib/plausible_web/live/components/verification_banner.ex@@ -172,7 +172,6 @@ defmodule PlausibleWeb.Live.Components.VerificationBanner do<div class="mt-5 flex flex-wrap items-center gap-2"><div id="verification-failed-default-actions" class="flex flex-wrap items-center gap-2"><.button_link- mt?={false}href="#"phx-click="retry"theme="secondary"@@ -183,7 +182,6 @@ defmodule PlausibleWeb.Live.Components.VerificationBanner do</.button_link><.button_link:if={@offer_custom_url_input?}- mt?={false}href="#"phx-click={JS.hide(to: "#verification-failed-default-actions")@@ -198,7 +196,6 @@ defmodule PlausibleWeb.Live.Components.VerificationBanner do</.button_link><.button_link:if={not @offer_custom_url_input?}- mt?={false}href={~p"/#{@domain}/installation?#{[flow: @flow, return_to: "dashboard"]}"}theme="ghost"size="sm"@@ -299,12 +296,11 @@ defmodule PlausibleWeb.Live.Components.VerificationBanner doid="custom_url"aria-label="Website URL"required- mt?={false}width="w-64 h-[38px] dark:bg-white/15 dark:border-transparent"placeholder={"https://#{@domain}"}value={"https://#{@domain}"}/>- <.button type="submit" mt?={false} theme="primary" size="sm">+ <.button type="submit" theme="primary" size="sm">Verify URL</.button></form>diff --git a/lib/plausible_web/live/csv_export.ex b/lib/plausible_web/live/csv_export.exindex 97cb6f8c99..534aa08d2d 100644--- a/lib/plausible_web/live/csv_export.ex+++ b/lib/plausible_web/live/csv_export.ex@@ -118,7 +118,7 @@ defmodule PlausibleWeb.Live.CSVExport do<p class="text-sm">Prepare your data for download by clicking the button below. When that's done, a Zip file that you can download will appear.</p>- <.button phx-click="export">Prepare download</.button>+ <.button phx-click="export" class="mt-6">Prepare download</.button>"""enddiff --git a/lib/plausible_web/live/csv_import.ex b/lib/plausible_web/live/csv_import.exindex 64c47dca1d..7298217889 100644--- a/lib/plausible_web/live/csv_import.ex+++ b/lib/plausible_web/live/csv_import.ex@@ -121,7 +121,7 @@ defmodule PlausibleWeb.Live.CSVImport dodefp confirm_button(assigns) do~H"""- <.button type="submit" disabled={not @can_confirm?} class="w-full">+ <.button type="submit" disabled={not @can_confirm?} class="w-full mt-6"><%= if @date_range do %>Confirm import <.dates range={@date_range} /><% else %>diff --git a/lib/plausible_web/live/goal_settings/form.ex b/lib/plausible_web/live/goal_settings/form.exindex ead9c153b9..52d5177f03 100644--- a/lib/plausible_web/live/goal_settings/form.ex+++ b/lib/plausible_web/live/goal_settings/form.ex@@ -137,7 +137,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form douse_custom_props={@use_custom_props}/>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Update goal</.button></.form>@@ -157,7 +157,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form doThese events have been sent from your site in the past 6 months but aren't yet configured as goals. Add them instantly or set one up manually.</p>- <div class="flex justify-end gap-3">+ <div class="flex justify-end gap-3 mt-6"><.buttontheme="secondary"phx-click="add-manually"@@ -223,7 +223,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form douse_custom_props={@use_custom_props}/>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Add goal</.button></.form>@@ -286,6 +286,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form dotype="text"x-data="{ firstFocus: true }"x-on:focus="if (firstFocus) { $el.select(); firstFocus = false; }"+ wrapper_class="mt-6"/><.custom_property_section@@ -368,6 +369,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form dostep="1"x-model="scrollThreshold"x-on:change="updateDisplayName"+ wrapper_class="mt-6"/><.label for={"scroll_page_path_input_#{@suffix}"} class="mt-3">@@ -399,6 +401,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form dox-model="displayName"x-data="{ firstFocus: true }"x-on:focus="if (firstFocus) { $el.select(); firstFocus = false; }"+ wrapper_class="mt-6"/><.custom_property_section@@ -473,7 +476,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do</.error></div>- <div class="mt-2">+ <div class="mt-6"><.inputlabel="Display name"id="custom_event_display_name_input"@@ -595,7 +598,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do</label><% end %><div class="mb-2" x-show="active" id={"revenue-input-#{@suffix}"}>- <.input :if={not is_nil(@goal)} type="text" field={@f[:currency]} disabled={true} mt?={false} />+ <.input :if={not is_nil(@goal)} type="text" field={@f[:currency]} disabled={true} /><.live_component:if={is_nil(@goal)}id={"currency_input_#{@suffix}"}diff --git a/lib/plausible_web/live/imports_exports_settings.ex b/lib/plausible_web/live/imports_exports_settings.exindex 637d36cce2..aefa9fc26b 100644--- a/lib/plausible_web/live/imports_exports_settings.ex+++ b/lib/plausible_web/live/imports_exports_settings.ex@@ -94,7 +94,6 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings dotheme="secondary"href={Plausible.Google.API.import_authorize_url(@site)}disabled={@import_in_progress? or @at_maximum?}- mt?={false}>Import from<img@@ -106,7 +105,6 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do<.button_linkdisabled={@import_in_progress? or @at_maximum?}href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}- mt?={false}>Import from CSV</.button_link>@@ -118,7 +116,6 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings dotheme="secondary"href={Plausible.Google.API.import_authorize_url(@site)}disabled={@import_in_progress? or @at_maximum?}- mt?={false}>Import from<img@@ -130,7 +127,6 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do<.button_linkdisabled={@import_in_progress? or @at_maximum?}href={"/#{URI.encode_www_form(@site.domain)}/settings/import"}- mt?={false}>Import from CSV</.button_link>diff --git a/lib/plausible_web/live/installation.ex b/lib/plausible_web/live/installation.exindex b5870bd8b1..2574980c0c 100644--- a/lib/plausible_web/live/installation.ex+++ b/lib/plausible_web/live/installation.ex@@ -208,7 +208,6 @@ defmodule PlausibleWeb.Live.Installation do<.secondary_action flow={@flow} return_to={@return_to} domain={@site.domain} /><.buttontype="submit"- mt?={false}class={install_method_event(@installation_type.result,@@ -379,7 +378,7 @@ defmodule PlausibleWeb.Live.Installation doassigns = assign(assigns, label: label, href: href)~H"""- <.button_link theme="ghost" href={@href} mt?={false}>+ <.button_link theme="ghost" href={@href}>{@label}</.button_link>"""diff --git a/lib/plausible_web/live/installation/instructions.ex b/lib/plausible_web/live/installation/instructions.exindex 1a89319809..9277571cfc 100644--- a/lib/plausible_web/live/installation/instructions.ex+++ b/lib/plausible_web/live/installation/instructions.ex@@ -159,7 +159,6 @@ defmodule PlausibleWeb.Live.Installation.Instructions dotype="button"theme="secondary"size="xs"- mt?={false}class="absolute top-1.5 right-1.5 shadow-xs"data-copy>diff --git a/lib/plausible_web/live/plugins/api/settings.ex b/lib/plausible_web/live/plugins/api/settings.exindex 5f8af6a3cc..84f0026296 100644--- a/lib/plausible_web/live/plugins/api/settings.ex+++ b/lib/plausible_web/live/plugins/api/settings.ex@@ -60,14 +60,14 @@ defmodule PlausibleWeb.Live.Plugins.API.Settings do</p><.buttonphx-click="create-token"- class="mt-4"+ class="mt-6">New plugin token</.button></div><% else %><.filter_bar filtering_enabled?={false}>- <.button phx-click="create-token" mt?={false}>+ <.button phx-click="create-token">Create plugin token</.button></.filter_bar>diff --git a/lib/plausible_web/live/plugins/api/token_form.ex b/lib/plausible_web/live/plugins/api/token_form.exindex f34c17a2e1..0a54777cc1 100644--- a/lib/plausible_web/live/plugins/api/token_form.ex+++ b/lib/plausible_web/live/plugins/api/token_form.ex@@ -75,7 +75,7 @@ defmodule PlausibleWeb.Live.Plugins.API.TokenForm do<.buttontheme="secondary"phx-click="close-token-modal"- class="w-full"+ class="w-full mt-6">Close modal</.button>@@ -85,7 +85,7 @@ defmodule PlausibleWeb.Live.Plugins.API.TokenForm doCreate plugin token for {@domain}</.title>- <div class="mt-4">+ <div class="mt-6"><.inputautofocusfield={f[:description]}@@ -100,7 +100,7 @@ defmodule PlausibleWeb.Live.Plugins.API.TokenForm do<p class="mt-4 text-sm text-gray-500 dark:text-gray-400">Once created, we will display the token so it can be copied.</p>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Create plugin token</.button></.form>diff --git a/lib/plausible_web/live/props_settings/form.ex b/lib/plausible_web/live/props_settings/form.exindex 38ec077b51..ed21a76645 100644--- a/lib/plausible_web/live/props_settings/form.ex+++ b/lib/plausible_web/live/props_settings/form.ex@@ -101,7 +101,7 @@ defmodule PlausibleWeb.Live.PropsSettings.Form do</.error></div>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Add property</.button>diff --git a/lib/plausible_web/live/props_settings/list.ex b/lib/plausible_web/live/props_settings/list.exindex 02f881bc21..1985c6f44b 100644--- a/lib/plausible_web/live/props_settings/list.ex+++ b/lib/plausible_web/live/props_settings/list.ex@@ -15,7 +15,7 @@ defmodule PlausibleWeb.Live.PropsSettings.List do<div class="flex flex-col gap-4 sm:gap-6"><%= if @searching? or Enum.count(@props) > 0 do %><.filter_bar filter_text={@filter_text} placeholder="Search Properties">- <.button phx-click="add-prop" mt?={false}>+ <.button phx-click="add-prop">Add property</.button></.filter_bar>@@ -70,7 +70,7 @@ defmodule PlausibleWeb.Live.PropsSettings.List do<.buttonid="add-property-button"phx-click="add-prop"- class="mt-4"+ class="mt-6">Add property</.button>diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.exindex c2175a5abf..a320cdae4c 100644--- a/lib/plausible_web/live/register_form.ex+++ b/lib/plausible_web/live/register_form.ex@@ -114,7 +114,6 @@ defmodule PlausibleWeb.Live.RegisterForm dofield={f[:password]}strength={@password_strength}phx-debounce={200}- mt?={false}/></div><.password_length_hint minimum={12} field={f[:password]} hide_when_used?={true} />@@ -135,7 +134,6 @@ defmodule PlausibleWeb.Live.RegisterForm doid="register"type="submit"class="w-full"- mt?={false}x-data={"{ captchaReady: #{not PlausibleWeb.Captcha.enabled?()} }"}x-on:frc-captcha-ready.window="captchaReady = true"x-on:frc-captcha-reset.window="captchaReady = false"@@ -178,7 +176,6 @@ defmodule PlausibleWeb.Live.RegisterForm dofield={@field}placeholder="Jane Doe"phx-debounce={200}- mt?={false}autofocus="autofocus"/></div>@@ -207,7 +204,6 @@ defmodule PlausibleWeb.Live.RegisterForm dofield={@field}placeholder="[email protected]"phx-debounce={200}- mt?={false}{@email_readonly}/></div>diff --git a/lib/plausible_web/live/reset_password_form.ex b/lib/plausible_web/live/reset_password_form.exindex 5ed06c1379..388c184b99 100644--- a/lib/plausible_web/live/reset_password_form.ex+++ b/lib/plausible_web/live/reset_password_form.ex@@ -49,14 +49,13 @@ defmodule PlausibleWeb.Live.ResetPasswordForm dofield={f[:password]}strength={@password_strength}phx-debounce={200}- mt?={false}/></div><.password_length_hint minimum={12} field={f[:password]} hide_when_used?={true} /></div><div class="flex flex-col gap-y-4">- <.button id="set" type="submit" class="w-full" mt?={false}>+ <.button id="set" type="submit" class="w-full">Update password</.button>diff --git a/lib/plausible_web/live/shared_link_settings.ex b/lib/plausible_web/live/shared_link_settings.exindex d627cf27f9..ebbbb9c572 100644--- a/lib/plausible_web/live/shared_link_settings.ex+++ b/lib/plausible_web/live/shared_link_settings.ex@@ -93,7 +93,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings dophx-click="add-shared-link"x-datax-on:click={Modal.JS.preopen("shared-links-form-modal")}- class="mt-4"+ class="mt-6">Add shared link</.button>@@ -104,7 +104,6 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do<.buttonid="add-shared-link-button"phx-click="add-shared-link"- mt?={false}x-datax-on:click={Modal.JS.preopen("shared-links-form-modal")}>diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.exindex 22ea886104..095b9b59f3 100644--- a/lib/plausible_web/live/shared_link_settings/form.ex+++ b/lib/plausible_web/live/shared_link_settings/form.ex@@ -39,7 +39,13 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form dodef edit_form(assigns) do~H"""- <.form :let={f} for={@form} phx-submit="save-shared-link" phx-target={@myself}>+ <.form+ :let={f}+ for={@form}+ phx-submit="save-shared-link"+ phx-target={@myself}+ class="flex flex-col gap-6"+ ><.title>Edit shared link</.title><.input field={f[:name]} label="Name" required="required" autocomplete="off" />@@ -86,7 +92,13 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form dodef create_form(assigns) do~H"""- <.form :let={f} for={@form} phx-submit="save-shared-link" phx-target={@myself}>+ <.form+ :let={f}+ for={@form}+ phx-submit="save-shared-link"+ phx-target={@myself}+ class="flex flex-col gap-6"+ ><.title>New shared link</.title><.input field={f[:name]} label="Name" required="required" autocomplete="off" />@@ -117,7 +129,6 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form dotype="password"placeholder="Enter password"autocomplete="new-password"- mt?={false}/></div></div>diff --git a/lib/plausible_web/live/shields/country_rules.ex b/lib/plausible_web/live/shields/country_rules.exindex 44d7803c25..480fcb333a 100644--- a/lib/plausible_web/live/shields/country_rules.ex+++ b/lib/plausible_web/live/shields/country_rules.ex@@ -54,7 +54,7 @@ defmodule PlausibleWeb.Live.Shields.CountryRules doid="add-country-rule"x-datax-on:click={Modal.JS.open("country-rule-form-modal")}- class="mt-4"+ class="mt-6">Add country</.button>@@ -68,7 +68,6 @@ defmodule PlausibleWeb.Live.Shields.CountryRules doid="add-country-rule"x-datax-on:click={Modal.JS.open("country-rule-form-modal")}- mt?={false}>Add country</.button>@@ -151,7 +150,7 @@ defmodule PlausibleWeb.Live.Shields.CountryRules do<p class="mt-4 text-sm text-gray-500 dark:text-gray-400">Once added, we will start rejecting traffic from this country within a few minutes.</p>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Add country</.button></.form>diff --git a/lib/plausible_web/live/shields/hostname_rules.ex b/lib/plausible_web/live/shields/hostname_rules.exindex 01cb6e961e..df2b211619 100644--- a/lib/plausible_web/live/shields/hostname_rules.ex+++ b/lib/plausible_web/live/shields/hostname_rules.ex@@ -58,7 +58,7 @@ defmodule PlausibleWeb.Live.Shields.HostnameRules doid="add-hostname-rule"x-datax-on:click={Modal.JS.open("hostname-rule-form-modal")}- class="mt-4"+ class="mt-6">Add hostname</.button>@@ -72,7 +72,6 @@ defmodule PlausibleWeb.Live.Shields.HostnameRules doid="add-hostname-rule"x-datax-on:click={Modal.JS.open("hostname-rule-form-modal")}- mt?={false}>Add hostname</.button>@@ -172,7 +171,7 @@ defmodule PlausibleWeb.Live.Shields.HostnameRules doNB: Once added, we will start rejecting traffic from non-matching hostnames within a few minutes.<% end %></p>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Add hostname</.button></.form>diff --git a/lib/plausible_web/live/shields/ip_rules.ex b/lib/plausible_web/live/shields/ip_rules.exindex 3115000133..741cb10ef7 100644--- a/lib/plausible_web/live/shields/ip_rules.ex+++ b/lib/plausible_web/live/shields/ip_rules.ex@@ -51,6 +51,7 @@ defmodule PlausibleWeb.Live.Shields.IPRules do:if={@ip_rules_count < Shields.maximum_ip_rules()}id="add-ip-rule"phx-click={Prima.Modal.JS.open("ip-rule-form-modal")}+ class="mt-6">Add IP address</.button>@@ -60,7 +61,6 @@ defmodule PlausibleWeb.Live.Shields.IPRules do<.buttonid="add-ip-rule"phx-click={Prima.Modal.JS.open("ip-rule-form-modal")}- mt?={false}>Add IP address</.button>@@ -174,6 +174,7 @@ defmodule PlausibleWeb.Live.Shields.IPRules dofield={f[:inet]}label="IP address"placeholder="e.g. 192.168.127.12"+ wrapper_class="mt-6"/></div>@@ -181,12 +182,13 @@ defmodule PlausibleWeb.Live.Shields.IPRules dofield={f[:description]}label="Description (optional)"placeholder="e.g. The Office"+ wrapper_class="mt-6"/><p class="mt-4 text-sm text-gray-500 dark:text-gray-400">Once added, we will start rejecting traffic from this IP within a few minutes.</p>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Add IP address</.button></.form>diff --git a/lib/plausible_web/live/shields/page_rules.ex b/lib/plausible_web/live/shields/page_rules.exindex c7eac3023d..96e19b3e10 100644--- a/lib/plausible_web/live/shields/page_rules.ex+++ b/lib/plausible_web/live/shields/page_rules.ex@@ -58,7 +58,7 @@ defmodule PlausibleWeb.Live.Shields.PageRules doid="add-page-rule"x-datax-on:click={Modal.JS.open("page-rule-form-modal")}- class="mt-4"+ class="mt-6">Add page</.button>@@ -72,7 +72,6 @@ defmodule PlausibleWeb.Live.Shields.PageRules doid="add-page-rule"x-datax-on:click={Modal.JS.open("page-rule-form-modal")}- mt?={false}>Add page</.button>@@ -168,7 +167,7 @@ defmodule PlausibleWeb.Live.Shields.PageRules dowill match <code>/blog/post</code>.Once added, we will start rejecting traffic from this page within a few minutes.</p>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Add page</.button></.form>diff --git a/lib/plausible_web/live/site_transfer_settings.ex b/lib/plausible_web/live/site_transfer_settings.exindex cc0a791d15..d09eadf3ed 100644--- a/lib/plausible_web/live/site_transfer_settings.ex+++ b/lib/plausible_web/live/site_transfer_settings.ex@@ -111,7 +111,6 @@ defmodule PlausibleWeb.Live.SiteTransferSettings dofield={f[:team_identifier]}options={@team_options}prompt="Select a team"- mt?={false}/></div><p@@ -143,7 +142,6 @@ defmodule PlausibleWeb.Live.SiteTransferSettings dofield={f[:email]}label="Email address"placeholder="[email protected]"- mt?={false}/></div></div>@@ -165,7 +163,6 @@ defmodule PlausibleWeb.Live.SiteTransferSettings dotype="hidden"field={f[:my_team_available]}value={true}- mt?={false}/></div></div>@@ -193,6 +190,7 @@ defmodule PlausibleWeb.Live.SiteTransferSettings dotype="submit"theme="danger"phx-disable-with="Transferring..."+ class="mt-6">{submit_label(f[:destination].value)}</.button>diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.exindex 93162af762..dc0481ecdc 100644--- a/lib/plausible_web/live/sites.ex+++ b/lib/plausible_web/live/sites.ex@@ -166,7 +166,6 @@ defmodule PlausibleWeb.Live.Sites do<.button_link:if={!@consolidated_view_cta_dismissed?}href={~p"/sites/new?#{[flow: PlausibleWeb.Flows.provisioning()]}"}- mt?={false}><Heroicons.plus class="size-4" /> Add website</.button_link>@@ -199,7 +198,6 @@ defmodule PlausibleWeb.Live.Sites do<.button_linkhref={"/sites/new?flow=#{PlausibleWeb.Flows.provisioning()}"}theme="primary"- mt?={false}><Heroicons.plus class="size-4" /> Add website</.button_link>@@ -207,7 +205,6 @@ defmodule PlausibleWeb.Live.Sites do:if={not Teams.setup?(@current_team) and @has_sites? and length(@teams) == 1}href={~p"/sites?#{[__team: hd(@teams).identifier]}"}theme="secondary"- mt?={false}>Go to team sites</.button_link>@@ -343,16 +340,12 @@ defmodule PlausibleWeb.Live.Sites doTo create a consolidated view, you'll need to set up a team.</p><div class="flex gap-x-2">- <.button_link- href={~p"/team/setup"}- mt?={false}- >+ <.button_link href={~p"/team/setup"}>Create team</.button_link><.button_linktheme="secondary"href="https://plausible.io/docs/consolidated-views"- mt?={false}>Learn more</.button_link>@@ -381,7 +374,6 @@ defmodule PlausibleWeb.Live.Sites do<.button_link:if={@can_manage_consolidated_view?}href={url(~p"/billing/choose-plan")}- mt?={false}>Upgrade</.button_link>@@ -389,7 +381,6 @@ defmodule PlausibleWeb.Live.Sites do<.button_linktheme="secondary"href="https://plausible.io/docs/consolidated-views"- mt?={false}>Learn more</.button_link>@@ -405,17 +396,13 @@ defmodule PlausibleWeb.Live.Sites do</p><div class="flex gap-x-2">- <.button_link- href="mailto:[email protected]"- mt?={false}- >+ <.button_link href="mailto:[email protected]">Contact us</.button_link><.button_linktheme="secondary"href="https://plausible.io/docs/consolidated-views"- mt?={false}>Learn more</.button_link>diff --git a/lib/plausible_web/live/subscription_settings.ex b/lib/plausible_web/live/subscription_settings.exindex 5b0434a5d2..62297105df 100644--- a/lib/plausible_web/live/subscription_settings.ex+++ b/lib/plausible_web/live/subscription_settings.ex@@ -80,7 +80,6 @@ defmodule PlausibleWeb.Live.SubscriptionSettings do</div><.button_linkhref={~p"/billing/choose-plan"}- mt?={false}id="upgrade-or-change-plan-link">{trial_button_label(@current_team)}@@ -131,7 +130,6 @@ defmodule PlausibleWeb.Live.SubscriptionSettings do}theme="secondary"href={@subscription.update_url}- mt?={false}id="billing-details-link">Billing details@@ -142,7 +140,6 @@ defmodule PlausibleWeb.Live.SubscriptionSettings doPlausible.Billing.Subscriptions.halted?(@subscription))}href={~p"/billing/choose-plan"}- mt?={false}id="upgrade-or-change-plan-link">{change_plan_button_label(@subscription)}@@ -278,6 +275,7 @@ defmodule PlausibleWeb.Live.SubscriptionSettings dotheme="secondary"x-on:click="showAll = true"x-show="!showAll"+ class="mt-6">Show more</.button>@@ -291,7 +289,7 @@ defmodule PlausibleWeb.Live.SubscriptionSettings do<%= if Plausible.Billing.Subscriptions.resumable?(@subscription) && @subscription.cancel_url do %><div class="flex gap-2">- <.button_link theme="danger" href={@subscription.cancel_url} mt?={false}>+ <.button_link theme="danger" href={@subscription.cancel_url}>Cancel plan</.button_link><%= if Application.get_env(:plausible, :environment) == "dev" do %>@@ -299,7 +297,6 @@ defmodule PlausibleWeb.Live.SubscriptionSettings dohref={@subscription.update_url}theme="secondary"class="text-yellow-600 dark:text-yellow-400"- mt?={false}>[DEV ONLY] Change status</.button_link>diff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex 7441d7c7bb..94ed2bdbe9 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -53,7 +53,6 @@ defmodule PlausibleWeb.Live.TeamManagement doplaceholder="Enter e-mail"phx-debounce={200}readonly={at_limit?(@layout, @team_members_limit) or @my_role not in [:admin, :owner]}- mt?={false}/></div>@@ -67,7 +66,6 @@ defmodule PlausibleWeb.Live.TeamManagement do<.buttonid="invite-member"type="submit"- mt?={false}disabled={at_limit?(@layout, @team_members_limit) or @my_role not in [:admin, :owner]}>Invitediff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.exindex 16860ced9d..76f7dfd875 100644--- a/lib/plausible_web/live/team_setup.ex+++ b/lib/plausible_web/live/team_setup.ex@@ -61,7 +61,13 @@ defmodule PlausibleWeb.Live.TeamSetup do><.flash_messages flash={@flash} />- <.form :let={f} for={@team_name_form} id="create-team-form" phx-submit="create-team">+ <.form+ :let={f}+ for={@team_name_form}+ id="create-team-form"+ phx-submit="create-team"+ class="mt-6"+ ><.inputtype="text"placeholder={"#{@current_user.name}'s team"}@@ -115,7 +121,6 @@ defmodule PlausibleWeb.Live.TeamSetup doname={"rows[#{@row.id}][email]"}value={@row.email}placeholder="Enter e-mail"- mt?={false}/></div>diff --git a/lib/plausible_web/live/tracking_settings.ex b/lib/plausible_web/live/tracking_settings.exindex acb3bbacd1..a662d86247 100644--- a/lib/plausible_web/live/tracking_settings.ex+++ b/lib/plausible_web/live/tracking_settings.ex@@ -190,7 +190,6 @@ defmodule PlausibleWeb.Live.TrackingSettings dotheme="link"size="xs"icon?={true}- mt?={false}href={@href}target="_blank"rel="noopener noreferrer"diff --git a/lib/plausible_web/templates/auth/activate.html.heex b/lib/plausible_web/templates/auth/activate.html.heexindex 9e709ce659..d741fea71e 100644--- a/lib/plausible_web/templates/auth/activate.html.heex+++ b/lib/plausible_web/templates/auth/activate.html.heex@@ -26,7 +26,7 @@</p></div>- <.button type="submit" class="w-full" mt?={false}>+ <.button type="submit" class="w-full">Activate account</.button></.form>@@ -64,7 +64,7 @@</div><% else %><div class="flex flex-col gap-y-2">- <.button_link method="post" class="w-full" href="/activate/request-code">+ <.button_link method="post" class="w-full mt-6" href="/activate/request-code">Send activation code</.button_link><p :if={@error} class="text-xs text-red-500 text-center">diff --git a/lib/plausible_web/templates/auth/force_initiate_2fa_setup.html.heex b/lib/plausible_web/templates/auth/force_initiate_2fa_setup.html.heexindex 7533c25a2c..882d166954 100644--- a/lib/plausible_web/templates/auth/force_initiate_2fa_setup.html.heex+++ b/lib/plausible_web/templates/auth/force_initiate_2fa_setup.html.heex@@ -22,7 +22,7 @@for={@conn.params}method="post">- <.button type="submit" class="w-full" mt?={false}>+ <.button type="submit" class="w-full">Proceed</.button></.form>diff --git a/lib/plausible_web/templates/auth/invitation_expired.html.heex b/lib/plausible_web/templates/auth/invitation_expired.html.heexindex bbd4715882..763b71dc78 100644--- a/lib/plausible_web/templates/auth/invitation_expired.html.heex+++ b/lib/plausible_web/templates/auth/invitation_expired.html.heex@@ -3,11 +3,10 @@<.button_link:if={Plausible.Auth.check_registration_enabled() == :ok}href="/register"- mt?={false}>Start free trial</.button_link>- <.button_link href="/login" theme="secondary" mt?={false}>+ <.button_link href="/login" theme="secondary">Sign in</.button_link></.auth_container>diff --git a/lib/plausible_web/templates/auth/login_form.html.heex b/lib/plausible_web/templates/auth/login_form.html.heexindex b43698efd4..70534342d3 100644--- a/lib/plausible_web/templates/auth/login_form.html.heex+++ b/lib/plausible_web/templates/auth/login_form.html.heex@@ -11,7 +11,6 @@autocomplete="username"placeholder="[email protected]"field={f[:email]}- mt?={false}autofocus="autofocus"/></div>@@ -28,7 +27,6 @@id="current-password"autocomplete="current-password"field={f[:password]}- mt?={false}/><.styled_link href="/password/request-reset" class="text-sm absolute top-0 right-0">Forgot password?@@ -44,7 +42,7 @@<input type="hidden" name="return_to" value={@conn.params["return_to"]} /><div class="flex flex-col gap-y-6">- <.button class="w-full" type="submit">Sign in</.button>+ <.button class="w-full mt-6" type="submit">Sign in</.button><div class="flex flex-col gap-y-2"><pdiff --git a/lib/plausible_web/templates/auth/oauth_error.html.heex b/lib/plausible_web/templates/auth/oauth_error.html.heexindex d1e2f0f5dc..c223fa3b11 100644--- a/lib/plausible_web/templates/auth/oauth_error.html.heex+++ b/lib/plausible_web/templates/auth/oauth_error.html.heex@@ -1,6 +1,6 @@<Layouts.auth heading="Authorization error" subtitle={@message} flash={@flash}><.auth_container class="flex justify-center">- <.button_link href="/sites" theme="secondary" mt?={false}>+ <.button_link href="/sites" theme="secondary">Back to your sites</.button_link></.auth_container>diff --git a/lib/plausible_web/templates/auth/password_reset_error.html.heex b/lib/plausible_web/templates/auth/password_reset_error.html.heexindex 17bf23d154..2c7230743a 100644--- a/lib/plausible_web/templates/auth/password_reset_error.html.heex+++ b/lib/plausible_web/templates/auth/password_reset_error.html.heex@@ -1,6 +1,6 @@<Layouts.auth heading={@heading} subtitle="Request a new one to reset your password."><.auth_container class="flex justify-center">- <.button_link href="/password/request-reset" mt?={false}>+ <.button_link href="/password/request-reset">Send new reset link</.button_link></.auth_container>diff --git a/lib/plausible_web/templates/auth/password_reset_request_form.html.heex b/lib/plausible_web/templates/auth/password_reset_request_form.html.heexindex 4cc4b7a212..8737d0fd58 100644--- a/lib/plausible_web/templates/auth/password_reset_request_form.html.heex+++ b/lib/plausible_web/templates/auth/password_reset_request_form.html.heex@@ -19,7 +19,6 @@autocomplete="username"placeholder="[email protected]"field={f[:email]}- mt?={false}autofocus="autofocus"/></div>@@ -36,7 +35,6 @@<.buttonclass="w-full"type="submit"- mt?={false}x-data={"{ captchaReady: #{not PlausibleWeb.Captcha.enabled?()} }"}x-on:frc-captcha-ready.window="captchaReady = true"x-on:frc-captcha-reset.window="captchaReady = false"diff --git a/lib/plausible_web/templates/auth/verify_2fa.html.heex b/lib/plausible_web/templates/auth/verify_2fa.html.heexindex 6c7508990d..009898818b 100644--- a/lib/plausible_web/templates/auth/verify_2fa.html.heex+++ b/lib/plausible_web/templates/auth/verify_2fa.html.heex@@ -24,12 +24,11 @@field={f[:remember_2fa]}value="true"label={"Remember this device for #{PlausibleWeb.TwoFactor.Session.remember_2fa_days()} days"}- mt?={false}class="block size-5 rounded-sm dark:bg-gray-700 border-gray-300 text-indigo-600 focus:ring-indigo-600"/></div>- <.input type="hidden" field={f[:return_to]} mt?={false} />+ <.input type="hidden" field={f[:return_to]} /></.form><div class="mt-6 flex flex-col gap-y-2 text-sm text-gray-500 dark:text-gray-400 text-center">diff --git a/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heex b/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heexindex c47a2b8a71..3782a5451b 100644--- a/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heex+++ b/lib/plausible_web/templates/auth/verify_2fa_recovery_code.html.heex@@ -20,7 +20,6 @@oninvalid="document.getElementById('use-code-button').disabled = false"required="required"placeholder="Recovery code"- mt?={false}/><p :if={@error} class="text-xs text-red-500 text-center">{@error}@@ -30,7 +29,6 @@<.buttonid="use-code-button"type="submit"- mt?={false}class="w-full [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"><span class="label-enabled pointer-events-none">diff --git a/lib/plausible_web/templates/billing/change_plan_preview.html.heex b/lib/plausible_web/templates/billing/change_plan_preview.html.heexindex b9b62b984d..6fd3bba2d0 100644--- a/lib/plausible_web/templates/billing/change_plan_preview.html.heex+++ b/lib/plausible_web/templates/billing/change_plan_preview.html.heex@@ -88,6 +88,7 @@<.button_linkhref={~p"/billing/change-plan/#{@preview_info["plan_id"]}"}method="post"+ class="mt-6">Confirm plan change</.button_link>diff --git a/lib/plausible_web/templates/error/404_error.html.heex b/lib/plausible_web/templates/error/404_error.html.heexindex ac9e31ac61..2ee7b3f7eb 100644--- a/lib/plausible_web/templates/error/404_error.html.heex+++ b/lib/plausible_web/templates/error/404_error.html.heex@@ -5,7 +5,7 @@<div :if={[email protected][:current_user]} class="text-xl dark:text-gray-100">Trying to access your dashboard? You may need to log in again to see it</div>- <div class="mt-4 flex">+ <div class="mt-10 flex"><.button_link:if={[email protected][:current_user]}href={~p"/login?#{[return_to: url_path(@conn)]}"}diff --git a/lib/plausible_web/templates/error/generic_error.html.heex b/lib/plausible_web/templates/error/generic_error.html.heexindex c76ef53f49..efd684f6fd 100644--- a/lib/plausible_web/templates/error/generic_error.html.heex+++ b/lib/plausible_web/templates/error/generic_error.html.heex@@ -1,7 +1,10 @@<div class="container text-center mt-24"><h1 class="text-5xl font-black dark:text-gray-100">{@status}</h1><div class="my-4 text-xl dark:text-gray-100">{@message}</div>- <.button_link href={PlausibleWeb.LayoutView.home_dest(@conn.assigns[:current_user])}>+ <.button_link+ href={PlausibleWeb.LayoutView.home_dest(@conn.assigns[:current_user])}+ class="mt-6"+ >Go to homepage</.button_link></div>diff --git a/lib/plausible_web/templates/error/server_error.html.heex b/lib/plausible_web/templates/error/server_error.html.heexindex 82601ebaa4..23e27443ac 100644--- a/lib/plausible_web/templates/error/server_error.html.heex+++ b/lib/plausible_web/templates/error/server_error.html.heex@@ -61,7 +61,7 @@placeholder="I clicked on 'X' and then hit 'Confirm'..."></textarea>- <.button class="w-full" type="submit">Send feedback</.button>+ <.button class="w-full mt-6" type="submit">Send feedback</.button></.form></div><% end %>diff --git a/lib/plausible_web/templates/google_analytics/confirm.html.heex b/lib/plausible_web/templates/google_analytics/confirm.html.heexindex 00c58e5e4b..fb58ee47b9 100644--- a/lib/plausible_web/templates/google_analytics/confirm.html.heex+++ b/lib/plausible_web/templates/google_analytics/confirm.html.heex@@ -23,7 +23,7 @@</span><.input type="hidden" value={@selected_property} field={f[:property]} readonly="true" /></div>- <div class="flex justify-between mt-3">+ <div class="flex justify-between mt-6"><div class="w-36"><.label for={f[:start_date].id}>From</.label><span class="block w-full text-base dark:text-gray-100 sm:text-sm dark:bg-gray-800">@@ -56,7 +56,7 @@<.buttontype="submit"name="confirmButton"- class="button sm:w-auto w-full [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"+ class="button sm:w-auto w-full mt-6 [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"><span class="label-enabled pointer-events-none">Confirm importdiff --git a/lib/plausible_web/templates/google_analytics/property_form.html.heex b/lib/plausible_web/templates/google_analytics/property_form.html.heexindex 2f5cc37bbd..0c283a08b6 100644--- a/lib/plausible_web/templates/google_analytics/property_form.html.heex+++ b/lib/plausible_web/templates/google_analytics/property_form.html.heex@@ -44,7 +44,7 @@<.buttontype="submit"name="continueButton"- class="button sm:w-auto w-full [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"+ class="button sm:w-auto w-full mt-6 [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"><span class="label-enabled pointer-events-none">Continuediff --git a/lib/plausible_web/templates/settings/api_keys.html.heex b/lib/plausible_web/templates/settings/api_keys.html.heexindex 3120b342a4..429a531848 100644--- a/lib/plausible_web/templates/settings/api_keys.html.heex+++ b/lib/plausible_web/templates/settings/api_keys.html.heex@@ -21,13 +21,13 @@Access your stats through the Plausible API.<.styled_link href="https://plausible.io/docs/stats-api">Learn more</.styled_link></p>- <.button_link href={~p"/settings/api-keys/new"}>+ <.button_link href={~p"/settings/api-keys/new"} class="mt-6">New API Key</.button_link></div><% else %><.filter_bar filtering_enabled?={false}>- <.button_link mt?={false} href={~p"/settings/api-keys/new"}>+ <.button_link href={~p"/settings/api-keys/new"}>New API Key</.button_link></.filter_bar>diff --git a/lib/plausible_web/templates/settings/danger_zone.html.heex b/lib/plausible_web/templates/settings/danger_zone.html.heexindex f1cb0d9d54..bc9daafd35 100644--- a/lib/plausible_web/templates/settings/danger_zone.html.heex+++ b/lib/plausible_web/templates/settings/danger_zone.html.heex@@ -29,7 +29,6 @@href="/me"method="delete"theme="danger"- mt?={false}>Delete my account</.button_link>diff --git a/lib/plausible_web/templates/settings/new_api_key.html.heex b/lib/plausible_web/templates/settings/new_api_key.html.heexindex 06fd913209..0e7a60aae4 100644--- a/lib/plausible_web/templates/settings/new_api_key.html.heex+++ b/lib/plausible_web/templates/settings/new_api_key.html.heex@@ -71,7 +71,7 @@Make sure to store the key in a secure place. Once created, we will not be able to show it again.</p></div>- <.button type="submit" class="w-full" x-bind:disabled="submitDisabled">+ <.button type="submit" class="w-full mt-6" x-bind:disabled="submitDisabled">Create API key</.button></.form>diff --git a/lib/plausible_web/templates/settings/preferences.html.heex b/lib/plausible_web/templates/settings/preferences.html.heexindex 635d2394b9..6a89723b4a 100644--- a/lib/plausible_web/templates/settings/preferences.html.heex+++ b/lib/plausible_web/templates/settings/preferences.html.heex@@ -9,9 +9,9 @@for={@name_changeset}method="post">- <.input type="text" field={f[:name]} label="Name" width="w-1/2" mt?={false} />+ <.input type="text" field={f[:name]} label="Name" width="w-1/2" />- <.button type="submit">+ <.button type="submit" class="mt-6">Change name</.button></.form>@@ -22,7 +22,7 @@<a id="view-name">Your name</a></:title><.form :let={f} for={@name_changeset}>- <.input type="text" field={f[:name]} disabled={true} label="Name" width="w-1/2" mt?={false} />+ <.input type="text" field={f[:name]} disabled={true} label="Name" width="w-1/2" /></.form></.tile>@@ -42,10 +42,9 @@options={Plausible.Themes.options()}label="Theme"width="w-1/2"- mt?={false}/>- <.button type="submit">+ <.button type="submit" class="mt-6">Change theme</.button></.form>diff --git a/lib/plausible_web/templates/settings/security.html.heex b/lib/plausible_web/templates/settings/security.html.heexindex 24724862b6..17d94312f0 100644--- a/lib/plausible_web/templates/settings/security.html.heex+++ b/lib/plausible_web/templates/settings/security.html.heex@@ -11,6 +11,7 @@action={~p"/settings/security/email"}for={@email_changeset}method="post"+ class="flex flex-col gap-6"><.inputtype="text"@@ -18,7 +19,6 @@value={f.data.email}label="Current email"width="w-1/2"- mt?={false}disabled/>@@ -26,7 +26,7 @@<.input type="password" field={f[:password]} label="Confirm with password" width="w-1/2" />- <.button type="submit">+ <.button type="submit" class="self-start">Change email</.button></.form>@@ -46,7 +46,6 @@value={f.data.email}label="Current email"width="w-1/2"- mt?={false}disabled/></.form>@@ -64,6 +63,7 @@action={~p"/settings/security/password"}for={@password_changeset}method="post"+ class="flex flex-col gap-6"><.inputtype="password"@@ -71,7 +71,6 @@field={f[:old_password]}label="Old password"width="w-1/2"- mt?={false}/><.input@@ -91,7 +90,7 @@width="w-1/2"/>- <div :if={@totp_enabled?} class="mt-6">+ <div :if={@totp_enabled?}><.label for={f[:two_factor_code].id} class="mb-2">Verify with 2FA Code</.label>@@ -103,7 +102,7 @@/></div>- <.button type="submit">+ <.button type="submit" class="self-start">Change password</.button></.form>@@ -123,7 +122,6 @@disabled={Plausible.Users.type(@current_user) == :sso}x-on:click="disable2FAOpen = true; $refs.disable2FAPassword.value = ''"theme="danger"- mt?={false}>Disable 2FA</.button>@@ -146,7 +144,7 @@for={@conn.params}method="post">- <.button type="submit" mt?={false}>+ <.button type="submit" class="mt-6">Enable 2FA</.button></.form>@@ -163,7 +161,7 @@<Heroicons.shield_exclamation class="h-6 w-6" /></:icon><:buttons>- <.button type="submit" class="w-full sm:w-auto">+ <.button type="submit" class="w-full sm:w-auto mt-6">Disable 2FA</.button></:buttons>@@ -176,7 +174,7 @@Enter your password to disable 2FA.</div>- <div class="mt-3">+ <div class="mt-6"><.inputtype="password"id="disable_2fa_password"@@ -204,7 +202,7 @@<.buttonid="generate-2fa-recovery-button"type="submit"- class="w-full sm:w-auto [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"+ class="w-full sm:w-auto mt-6 [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"><span class="label-enabled pointer-events-none">Generate New Codes@@ -225,7 +223,7 @@Enter your password to continue.</div>- <div class="mt-3 w-full">+ <div class="mt-6 w-full"><.inputtype="password"id="regenerate_2fa_password"diff --git a/lib/plausible_web/templates/settings/team_danger_zone.html.heex b/lib/plausible_web/templates/settings/team_danger_zone.html.heexindex 1621fbc814..3e5415977d 100644--- a/lib/plausible_web/templates/settings/team_danger_zone.html.heex+++ b/lib/plausible_web/templates/settings/team_danger_zone.html.heex@@ -17,7 +17,6 @@href={~p"/settings/team/delete"}method="delete"theme="danger"- mt?={false}>Delete "{Plausible.Teams.name(@current_team)}"</.button_link>diff --git a/lib/plausible_web/templates/settings/team_general.html.heex b/lib/plausible_web/templates/settings/team_general.html.heexindex 1093c2fcc0..c474166d85 100644--- a/lib/plausible_web/templates/settings/team_general.html.heex+++ b/lib/plausible_web/templates/settings/team_general.html.heex@@ -18,10 +18,13 @@field={f[:name]}label="Name"width="w-1/2"- mt?={false}/>- <.button type="submit" disabled={@current_team_role not in [:owner, :admin]}>+ <.button+ type="submit"+ disabled={@current_team_role not in [:owner, :admin]}+ class="mt-6"+ >Change name</.button></.form>@@ -64,7 +67,6 @@<.buttontheme="danger"x-on:click="disableTeamForce2FAOpen = true; $refs.disableTeamForce2FAPassword.value = ''"- mt?={false}>Stop Forcing 2FA</.button>@@ -80,7 +82,7 @@<Heroicons.shield_exclamation class="h-6 w-6" /></:icon><:buttons>- <.button type="submit" class="w-full sm:w-auto">+ <.button type="submit" class="w-full sm:w-auto mt-6">Stop enforcing 2FA</.button></:buttons>@@ -93,7 +95,7 @@Enter your password to stop enforcing 2FA.</div>- <div class="mt-3">+ <div class="mt-6"><.inputtype="password"id="disable_team_force_2fa_password"@@ -116,7 +118,6 @@<.buttondata-confirm="All team members, including you, will need to set up 2FA. Are you sure you want to enforce it?"type="submit"- mt?={false}>Enforce 2FA</.button>@@ -131,7 +132,6 @@href={~p"/settings/team/leave"}method="post"theme="danger"- mt?={false}>Leave team</.button_link>diff --git a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex b/lib/plausible_web/templates/site/membership/invite_member_form.html.heexindex 89478f07a5..f25cba2023 100644--- a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex+++ b/lib/plausible_web/templates/site/membership/invite_member_form.html.heex@@ -96,7 +96,7 @@</fieldset><div class="mt-6">- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Invite</.button></div>diff --git a/lib/plausible_web/templates/site/settings_danger_zone.html.heex b/lib/plausible_web/templates/site/settings_danger_zone.html.heexindex ba3f947e5a..08fce1f8e8 100644--- a/lib/plausible_web/templates/site/settings_danger_zone.html.heex+++ b/lib/plausible_web/templates/site/settings_danger_zone.html.heex@@ -16,7 +16,6 @@method="delete"data-confirm="Resetting the stats cannot be reversed. Are you sure?"theme="danger"- mt?={false}>Reset {@site.domain} stats</.button_link>@@ -30,7 +29,6 @@theme="danger"method="delete"data-confirm="Deleting the site data cannot be reversed. Are you sure?"- mt?={false}>Delete {@site.domain}</.button_link>diff --git a/lib/plausible_web/templates/site/settings_email_reports.html.heex b/lib/plausible_web/templates/site/settings_email_reports.html.heexindex c7775c0555..f152cdc5b2 100644--- a/lib/plausible_web/templates/site/settings_email_reports.html.heex+++ b/lib/plausible_web/templates/site/settings_email_reports.html.heex@@ -88,9 +88,8 @@type="email"requiredplaceholder="e.g. [email protected]"- mt?={false}/>- <.button type="submit" mt?={false}>+ <.button type="submit">Add recipient</.button></div>@@ -151,8 +150,9 @@type="number"requiredlabel={meta.threshold_text}+ wrapper_class="mt-6"/>- <.button type="submit" mt?={false}>+ <.button type="submit">Save threshold</.button></div>@@ -200,10 +200,9 @@field={f[:recipient]}type="email"placeholder="e.g. [email protected]"- mt?={false}required/>- <.button type="submit" mt?={false}>+ <.button type="submit">Add recipient</.button></div>diff --git a/lib/plausible_web/templates/site/settings_general.html.heex b/lib/plausible_web/templates/site/settings_general.html.heexindex 738f2c964d..0693d9e5d1 100644--- a/lib/plausible_web/templates/site/settings_general.html.heex+++ b/lib/plausible_web/templates/site/settings_general.html.heex@@ -34,14 +34,12 @@type="select"options={Plausible.Timezones.options()}width="w-full max-w-72"- mt?={false}/></div><.buttontheme="secondary"type="submit"class="shrink-0"- mt?={false}disabledx-bind:disabled="!changed">diff --git a/lib/plausible_web/templates/site/settings_integrations.html.heex b/lib/plausible_web/templates/site/settings_integrations.html.heexindex dbd16aeb36..6322e4d5c8 100644--- a/lib/plausible_web/templates/site/settings_integrations.html.heex+++ b/lib/plausible_web/templates/site/settings_integrations.html.heex@@ -18,13 +18,13 @@value={@site.google_auth.email}disabled="disabled"width="w-1/2"- mt?={false}/><.button_linktheme="danger"href={~p"/#{@site.domain}/settings/google-search"}method="delete"+ class="mt-6">Unlink Google account</.button_link>@@ -66,7 +66,7 @@)}</div>- <.button type="submit">Save</.button>+ <.button type="submit" class="mt-6">Save</.button></.form><% {:error, error} -> %><.notice title="Integration error" theme={:red} class="mt-8">diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heexindex c91d735310..34c22fcd37 100644--- a/lib/plausible_web/templates/site/settings_people.html.heex+++ b/lib/plausible_web/templates/site/settings_people.html.heex@@ -16,10 +16,7 @@<:subtitle>Invite your friends or coworkers</:subtitle><.filter_bar :if={@site_role in [:owner, :admin]} filtering_enabled?={false}>- <.button_link- mt?={false}- href={~p"/sites/#{@site.domain}/memberships/invite"}- >+ <.button_link href={~p"/sites/#{@site.domain}/memberships/invite"}>Invite new guest</.button_link></.filter_bar>diff --git a/lib/plausible_web/templates/site/settings_visibility.html.heex b/lib/plausible_web/templates/site/settings_visibility.html.heexindex 241c5a357e..2e4aa9c601 100644--- a/lib/plausible_web/templates/site/settings_visibility.html.heex+++ b/lib/plausible_web/templates/site/settings_visibility.html.heex@@ -49,38 +49,40 @@You can use shared links to embed your stats in any other webpage using an <code>iframe</code>. Copy & paste a shared link into the form below to generate the embed code.</:subtitle>- <.input- name="embed-link"- id="embed-link"- label="Enter shared link (only public shared links without password can be embedded)"- value=""- width="w-1/2"- mt?={false}- />+ <div class="flex flex-col gap-6">+ <.input+ name="embed-link"+ id="embed-link"+ label="Enter shared link (only public shared links without password can be embedded)"+ value=""+ width="w-1/2"+ />- <.input- type="select"- name="theme"- id="theme"- label="Select theme"- options={["Light", "Dark", "System"]}- value="Light"- width="w-1/2"- />+ <.input+ type="select"+ name="theme"+ id="theme"+ label="Select theme"+ options={["Light", "Dark", "System"]}+ value="Light"+ width="w-1/2"+ />- <.input- name="background"- id="background"- label="Custom background color (optional). Try using `transparent` background to blend the dashboard with your site."- value=""- placeholder="e.g. #F9FAFB"- width="w-1/2"- />+ <.input+ name="background"+ id="background"+ label="Custom background color (optional). Try using `transparent` background to blend the dashboard with your site."+ value=""+ placeholder="e.g. #F9FAFB"+ width="w-1/2"+ />++ <.button id="generate-embed" class="self-start">+ Generate embed code+ </.button>+ </div><.input name="base-url" type="hidden" id="base-url" value={plausible_url()} />- <.button id="generate-embed" mt?={false}>- Generate embed code- </.button><.label for="embed-code" class="mt-4">Embed code</.label>diff --git a/lib/plausible_web/templates/stats/shared_link_password.html.heex b/lib/plausible_web/templates/stats/shared_link_password.html.heexindex 0269010da4..984825aa1d 100644--- a/lib/plausible_web/templates/stats/shared_link_password.html.heex+++ b/lib/plausible_web/templates/stats/shared_link_password.html.heex@@ -17,7 +17,7 @@<% end %></div>- <.button type="submit" class="w-full">+ <.button type="submit" class="w-full mt-6">Continue</.button></.form>diff --git a/lib/plausible_web/templates/stats/site_locked.html.heex b/lib/plausible_web/templates/stats/site_locked.html.heexindex 87ca5bd0b7..7c80fe7601 100644--- a/lib/plausible_web/templates/stats/site_locked.html.heex+++ b/lib/plausible_web/templates/stats/site_locked.html.heex@@ -44,7 +44,7 @@</p></div><div class="w-full text-center">- <.button_link href={~p"/settings/billing/subscription"}>+ <.button_link href={~p"/settings/billing/subscription"} class="mt-6">Manage my subscription</.button_link></div>@@ -55,7 +55,7 @@</p></div><div class="mt-6 w-full text-center">- <.button_link href={~p"/sites"}>Back to my sites</.button_link>+ <.button_link href={~p"/sites"} class="mt-6">Back to my sites</.button_link></div><% _ -> %><div class="mt-3 text-gray-600 dark:text-gray-300 text-center text-sm">@@ -66,7 +66,7 @@</div><%= if @conn.assigns[:current_user] do %><div class="mt-6 w-full text-center">- <.button_link href={~p"/sites"}>Back to my sites</.button_link>+ <.button_link href={~p"/sites"} class="mt-6">Back to my sites</.button_link></div><% end %><% end %>diff --git a/test/support/dev/templates/dev_subscription/create_dev_subscription.heex b/test/support/dev/templates/dev_subscription/create_dev_subscription.heexindex 4ef694a8b7..0a234cb919 100644--- a/test/support/dev/templates/dev_subscription/create_dev_subscription.heex+++ b/test/support/dev/templates/dev_subscription/create_dev_subscription.heex@@ -34,7 +34,6 @@<.button_linkhref={~p"/dev/billing/create-subscription/#{@plan_id}"}method="post"- mt?={false}>Subscribe to plan</.button_link>