From 12163cc333f0e23d3e646df4e017f510541360a2 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 3 Jul 2020 10:20:38 +0300 Subject: [PATCH] Wrap top-level flex items in block containers Fixes layout issue on Safari (https://twitter.com/jordelver/status/1278412853553369089) --- .../templates/auth/register_form.html.eex | 79 +++---- .../templates/billing/upgrade.html.eex | 206 +++++++++--------- 2 files changed, 144 insertions(+), 141 deletions(-) diff --git a/lib/plausible_web/templates/auth/register_form.html.eex b/lib/plausible_web/templates/auth/register_form.html.eex index 1c334cd85..4105e54f8 100644 --- a/lib/plausible_web/templates/auth/register_form.html.eex +++ b/lib/plausible_web/templates/auth/register_form.html.eex @@ -3,46 +3,47 @@
Set up privacy-friendly analytics with just a few clicks
-
- <%= form_for @changeset, "/register", [class: "w-full max-w-md mx-auto bg-white shadow-md rounded px-8 py-6 mb-4 mt-8", id: "register-form"], fn f -> %> -

Enter your details

-
- <%= label f, :name, "Full name", class: "block text-gray-700 text-sm font-bold mb-2" %> - <%= text_input f, :name, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "Jane Doe" %> - <%= error_tag f, :name %> -
-
- <%= label f, :email, class: "block text-gray-700 text-sm font-bold mb-2" %> -

No spam, guaranteed.

- <%= email_input f, :email, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "example@email.com" %> - <%= error_tag f, :email %> -
+
+
+ <%= form_for @changeset, "/register", [class: "w-full max-w-md mx-auto bg-white shadow-md rounded px-8 py-6 mb-4 mt-8", id: "register-form"], fn f -> %> +

Enter your details

+
+ <%= label f, :name, "Full name", class: "block text-gray-700 text-sm font-bold mb-2" %> + <%= text_input f, :name, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "Jane Doe" %> + <%= error_tag f, :name %> +
+
+ <%= label f, :email, class: "block text-gray-700 text-sm font-bold mb-2" %> +

No spam, guaranteed.

+ <%= email_input f, :email, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "example@email.com" %> + <%= error_tag f, :email %> +
- <%= submit "Start my free trial →", class: "button mt-4 w-full" %> + <%= submit "Start my free trial →", class: "button mt-4 w-full" %> -

- Already have an account? <%= link("Log in", to: "/login", class: "underline text-gray-800") %> instead. -

- <% end %> - -
diff --git a/lib/plausible_web/templates/billing/upgrade.html.eex b/lib/plausible_web/templates/billing/upgrade.html.eex index 9d9a3d117..5f8b40cf2 100644 --- a/lib/plausible_web/templates/billing/upgrade.html.eex +++ b/lib/plausible_web/templates/billing/upgrade.html.eex @@ -6,118 +6,120 @@

Upgrade your free trial

-
-
-
- You've used <%= PlausibleWeb.AuthView.delimit_integer(@usage) %> pageviews in the last 30 days -
+
+
+
+
+ You've used <%= PlausibleWeb.AuthView.delimit_integer(@usage) %> pageviews in the last 30 days +
-
+
- - - - + + + + -
+
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Monthly pageviews - - Price per month -
10k - $6 - $4 -
100k - $12 - $8 -
200k - $18 - $12 -
500k - $27 - $18 -
1m - $48 - $32 -
2m - $69 - $46 -
5m - $99 - $66 -
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Monthly pageviews + + Price per month +
10k + $6 + $4 +
100k + $12 + $8 +
200k + $18 + $12 +
500k + $27 + $18 +
1m + $48 + $32 +
2m + $69 + $46 +
5m + $99 + $66 +
+
-
-
-
Due today: $6
- - - +
+
Due today: $6
+ + + +
-
-
-

- What happens if I go over my page views limit? -

-
- You will never be charged extra for an occasional traffic spike. There are no surprise fees and your card will never be charged unexpectedly.

- If your page views exceed your plan for two consecutive months, we will contact you to upgrade to a higher plan for the following month. You will have two weeks to make a decision. You can decide to continue with a higher plan or to cancel your account at that point. -
+
+

+ What happens if I go over my page views limit? +

+
+ You will never be charged extra for an occasional traffic spike. There are no surprise fees and your card will never be charged unexpectedly.

+ If your page views exceed your plan for two consecutive months, we will contact you to upgrade to a higher plan for the following month. You will have two weeks to make a decision. You can decide to continue with a higher plan or to cancel your account at that point. +
+