Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Make settings sidebars sticky (#5242)

hq10e8c8b4063b0
diff --git a/lib/plausible_web/live/components/form.ex b/lib/plausible_web/live/components/form.ex
index 933865fc1f..dfcfd33359 100644
--- a/lib/plausible_web/live/components/form.ex
+++ b/lib/plausible_web/live/components/form.ex
@@ -380,7 +380,7 @@ defmodule PlausibleWeb.Live.Components.Form do
assigns = assign(assigns, :options, options)
~H"""
- <.form for={@conn} class="lg:hidden">
+ <.form for={@conn} class="lg:hidden py-4">
<.input
value={
@options
diff --git a/lib/plausible_web/templates/layout/settings.html.heex b/lib/plausible_web/templates/layout/settings.html.heex
index cb3a045769..5b75719217 100644
--- a/lib/plausible_web/templates/layout/settings.html.heex
+++ b/lib/plausible_web/templates/layout/settings.html.heex
@@ -10,12 +10,7 @@
</h2>
</div>
<div class="lg:grid lg:grid-cols-12 lg:gap-x-5 lg:mt-4">
- <div class="py-4 g:py-0 lg:col-span-3">
- <div class="mb-4 hidden lg:block">
- <h3 class="uppercase text-sm text-indigo-600 font-semibold">Account Settings</h3>
- <p class="text-xs dark:text-gray-400 truncate">{@current_user.email}</p>
- </div>
-
+ <div class="lg:col-span-3">
<.mobile_nav_dropdown
name="settings"
options={options}
@@ -24,7 +19,9 @@
href_base="/settings/"
/>
- <div class="hidden lg:block">
+ <div class="hidden lg:block py-4 top-0 sticky">
+ <h3 class="uppercase text-sm text-indigo-600 font-semibold">Account Settings</h3>
+ <p class="text-xs dark:text-gray-400 truncate">{@current_user.email}</p>
<%= for %{key: key, value: value, icon: icon} <- options["Account Settings"] do %>
{render("_settings_tab.html",
icon: icon,
@@ -34,19 +31,15 @@
submenu?: false
)}
<% end %>
- </div>
- <div :if={
- Plausible.Teams.enabled?(@current_user) and Plausible.Teams.setup?(@current_team)
- }>
- <div class="mb-4 mt-4 hidden lg:block">
- <h3 class="uppercase text-sm text-indigo-600 font-semibold">Team Settings</h3>
- <p class="text-xs dark:text-gray-400 truncate">
+ <div :if={
+ Plausible.Teams.enabled?(@current_user) and Plausible.Teams.setup?(@current_team)
+ }>
+ <h3 class="uppercase text-sm text-indigo-600 font-semibold mt-6">Team Settings</h3>
+ <p class="text-xs dark:text-gray-400 truncate mb-4">
{Plausible.Teams.name(@current_team)}
</p>
- </div>
- <div class="hidden lg:block">
<%= for %{key: key, value: value, icon: icon} <- options["Team Settings"] do %>
{render("_settings_tab.html",
icon: icon,
diff --git a/lib/plausible_web/templates/layout/site_settings.html.heex b/lib/plausible_web/templates/layout/site_settings.html.heex
index 81cfa8dc42..def5cdb4ea 100644
--- a/lib/plausible_web/templates/layout/site_settings.html.heex
+++ b/lib/plausible_web/templates/layout/site_settings.html.heex
@@ -12,7 +12,7 @@
</h2>
</div>
<div class="lg:grid lg:grid-cols-12 lg:gap-x-5 lg:mt-4">
- <div class="py-4 g:py-0 lg:col-span-3">
+ <div class="lg:col-span-3">
<% options = flat_site_settings_options(@conn) %>
<.mobile_nav_dropdown
conn={@conn}
@@ -22,7 +22,7 @@
selected_fn={&is_current_tab(@conn, &1)}
/>
- <div class="hidden lg:block">
+ <div class="hidden lg:block py-4 sticky top-0">
<%= for %{key: key, value: value, icon: icon} <- site_settings_sidebar(@conn) do %>
<%= if is_binary(value) do %>
{render("_site_settings_tab.html",