diff --git a/lib/berrypod_web/components/block_editor_components.ex b/lib/berrypod_web/components/block_editor_components.ex index f851233..fbeb257 100644 --- a/lib/berrypod_web/components/block_editor_components.ex +++ b/lib/berrypod_web/components/block_editor_components.ex @@ -324,7 +324,7 @@ defmodule BerrypodWeb.BlockEditorComponents do aria-label={"Move item #{idx + 1} up"} disabled={idx == 0} > - <.icon name="hero-chevron-up-mini" class="size-3.5" /> + <.icon name="hero-chevron-up-mini" class="size-4" /> @@ -362,7 +362,7 @@ defmodule BerrypodWeb.BlockEditorComponents do phx-value-field={@field.key} class="admin-btn admin-btn-outline admin-btn-xs repeater-add-btn" > - <.icon name="hero-plus-mini" class="size-3.5" /> Add item + <.icon name="hero-plus-mini" class="size-4" /> Add item """ diff --git a/lib/berrypod_web/components/layouts.ex b/lib/berrypod_web/components/layouts.ex index 1240dab..21b422c 100644 --- a/lib/berrypod_web/components/layouts.ex +++ b/lib/berrypod_web/components/layouts.ex @@ -109,14 +109,14 @@ defmodule BerrypodWeb.Layouts do def theme_toggle(assigns) do ~H"""
-
+
""" diff --git a/lib/berrypod_web/components/layouts/admin_root.html.heex b/lib/berrypod_web/components/layouts/admin_root.html.heex index 180e1e7..c74a471 100644 --- a/lib/berrypod_web/components/layouts/admin_root.html.heex +++ b/lib/berrypod_web/components/layouts/admin_root.html.heex @@ -1,5 +1,5 @@ - + @@ -28,7 +28,7 @@ - +
{@inner_content}
diff --git a/lib/berrypod_web/components/layouts/root.html.heex b/lib/berrypod_web/components/layouts/root.html.heex index aeedb70..20f1667 100644 --- a/lib/berrypod_web/components/layouts/root.html.heex +++ b/lib/berrypod_web/components/layouts/root.html.heex @@ -1,5 +1,5 @@ - + @@ -27,7 +27,7 @@ - +
{@inner_content}
diff --git a/lib/berrypod_web/components/shop_components/content.ex b/lib/berrypod_web/components/shop_components/content.ex index 0b163fd..20453b5 100644 --- a/lib/berrypod_web/components/shop_components/content.ex +++ b/lib/berrypod_web/components/shop_components/content.ex @@ -928,12 +928,10 @@ defmodule BerrypodWeb.ShopComponents.Content do ## Attributes * `text` - Required. The title text. - * `class` - Optional. Additional CSS classes. ## Examples <.page_title text="Your basket" /> - <.page_title text="Order History" class="mb-4" /> """ attr :text, :string, required: true diff --git a/lib/berrypod_web/controllers/error_html.ex b/lib/berrypod_web/controllers/error_html.ex index de27e92..5df9073 100644 --- a/lib/berrypod_web/controllers/error_html.ex +++ b/lib/berrypod_web/controllers/error_html.ex @@ -111,7 +111,7 @@ defmodule BerrypodWeb.ErrorHTML do ~H""" - + @@ -121,9 +121,9 @@ defmodule BerrypodWeb.ErrorHTML do <%= Phoenix.HTML.raw(@generated_css) %> - +
{page.title} - + Draft diff --git a/lib/berrypod_web/live/auth/confirmation.ex b/lib/berrypod_web/live/auth/confirmation.ex index 9e7043b..f9d3aef 100644 --- a/lib/berrypod_web/live/auth/confirmation.ex +++ b/lib/berrypod_web/live/auth/confirmation.ex @@ -7,8 +7,8 @@ defmodule BerrypodWeb.Auth.Confirmation do def render(assigns) do ~H""" -
-
+
+
<.header>Welcome {@user.email}
@@ -27,11 +27,11 @@ defmodule BerrypodWeb.Auth.Confirmation do value="true" phx-disable-with="Confirming..." variant="primary" - class="w-full" + class="admin-btn-block" > Confirm and stay logged in - <.button phx-disable-with="Confirming..." class="w-full mt-2"> + <.button phx-disable-with="Confirming..." class="admin-btn-block"> Confirm and log in only this time @@ -47,7 +47,7 @@ defmodule BerrypodWeb.Auth.Confirmation do > <%= if @current_scope do %> - <.button phx-disable-with="Logging in..." variant="primary" class="w-full"> + <.button phx-disable-with="Logging in..." variant="primary" class="admin-btn-block"> Log in <% else %> @@ -56,19 +56,19 @@ defmodule BerrypodWeb.Auth.Confirmation do value="true" phx-disable-with="Logging in..." variant="primary" - class="w-full" + class="admin-btn-block" > Keep me logged in on this device - <.button phx-disable-with="Logging in..." class="w-full mt-2"> + <.button phx-disable-with="Logging in..." class="admin-btn-block"> Log me in only this time <% end %> -

+

Tip: If you prefer passwords, you can enable them in the user settings. -

+
""" diff --git a/lib/berrypod_web/live/auth/login.ex b/lib/berrypod_web/live/auth/login.ex index f6aaa45..2b07db0 100644 --- a/lib/berrypod_web/live/auth/login.ex +++ b/lib/berrypod_web/live/auth/login.ex @@ -7,10 +7,10 @@ defmodule BerrypodWeb.Auth.Login do def render(assigns) do ~H""" -
-
+
+
<.header> -

Log in

+ Log in <:subtitle> <%= if @current_scope do %> You need to reauthenticate to perform sensitive actions on your account. @@ -26,7 +26,7 @@ defmodule BerrypodWeb.Auth.Login do

You are running the local mail adapter.

- To see sent emails, visit <.link href="/dev/mailbox" class="underline">the mailbox page. + To see sent emails, visit <.link href="/dev/mailbox" class="admin-link">the mailbox page.

@@ -48,8 +48,8 @@ defmodule BerrypodWeb.Auth.Login do required phx-mounted={JS.focus()} /> - <.button variant="primary" class="w-full"> - Log in with email + <.button variant="primary" class="admin-btn-block"> + Log in with email @@ -78,17 +78,22 @@ defmodule BerrypodWeb.Auth.Login do label="Password" autocomplete="current-password" /> - <.button variant="primary" class="w-full" name={@form[:remember_me].name} value="true"> - Log in and stay logged in + <.button + variant="primary" + class="admin-btn-block" + name={@form[:remember_me].name} + value="true" + > + Log in and stay logged in - <.button class="w-full mt-2"> + <.button class="admin-btn-block"> Log in only this time -

+

Locked out? - <.link navigate={~p"/recover"} class="font-semibold text-brand hover:underline"> + <.link navigate={~p"/recover"} class="admin-link"> Recover with setup secret

diff --git a/lib/berrypod_web/live/auth/registration.ex b/lib/berrypod_web/live/auth/registration.ex index 7440dff..06c5090 100644 --- a/lib/berrypod_web/live/auth/registration.ex +++ b/lib/berrypod_web/live/auth/registration.ex @@ -8,15 +8,13 @@ defmodule BerrypodWeb.Auth.Registration do def render(assigns) do ~H""" -
-
+
+
<.header> Register for an account <:subtitle> Already registered? - <.link navigate={~p"/users/log-in"} class="font-semibold text-brand hover:underline"> - Log in - + <.link navigate={~p"/users/log-in"} class="admin-link">Log in to your account now. @@ -32,7 +30,7 @@ defmodule BerrypodWeb.Auth.Registration do phx-mounted={JS.focus()} /> - <.button phx-disable-with="Creating account..." variant="primary" class="w-full"> + <.button phx-disable-with="Creating account..." variant="primary" class="admin-btn-block"> Create an account diff --git a/lib/berrypod_web/live/setup/recover.ex b/lib/berrypod_web/live/setup/recover.ex index 4de8d14..6e0eddd 100644 --- a/lib/berrypod_web/live/setup/recover.ex +++ b/lib/berrypod_web/live/setup/recover.ex @@ -69,13 +69,15 @@ defmodule BerrypodWeb.Setup.Recover do def render(assigns) do ~H""" -
- <.header> - Account recovery - <:subtitle> - Reset your admin password using the setup secret from your server logs. - - +
+
+ <.header> + Account recovery + <:subtitle> + Reset your admin password using the setup secret from your server logs. + + +
<.icon name="hero-information-circle" class="size-6 shrink-0" /> @@ -100,14 +102,14 @@ defmodule BerrypodWeb.Setup.Recover do autocomplete="new-password" required /> -

Minimum 12 characters

- <.button variant="primary" class="w-full"> +

Minimum 12 characters

+ <.button variant="primary" class="admin-btn-block"> Reset password and log in -

- <.link navigate={~p"/users/log-in"} class="font-semibold text-brand hover:underline"> +

+ <.link navigate={~p"/users/log-in"} class="admin-link"> Back to login