Merge remote-tracking branch 'origin/main' into issue/mitgliederverwaltung-547

# Conflicts:
#	lib/mv_web/live/member_live/index.html.heex
This commit is contained in:
Simon 2026-07-12 12:29:47 +02:00
commit fe6d1c52f9
9 changed files with 72 additions and 75 deletions

View file

@ -135,7 +135,7 @@ defmodule MvWeb.CoreComponents do
<.button variant="ghost" size="sm">Edit</.button>
<.button disabled={true}>Disabled</.button>
"""
attr :rest, :global, include: ~w(href navigate patch method data-testid form)
attr :rest, :global, include: ~w(href navigate patch method data-testid form type)
attr :variant, :string,
values: ~w(primary secondary neutral ghost outline danger link icon),

View file

@ -171,8 +171,8 @@ defmodule MvWeb.Layouts do
</label>
<span class="font-bold">{@club_name}</span>
</header>
<!-- Main Content (shared between mobile and desktop) -->
<!-- Main Content (shared between mobile and desktop) -->
<main class="px-4 py-8 sm:px-6 lg:px-8">
<div class="mx-auto space-y-4 max-full">
{render_slot(@inner_block)}

View file

@ -26,8 +26,7 @@ defmodule MvWeb.Layouts.Sidebar do
aria-label={gettext("Close sidebar")}
class="drawer-overlay lg:hidden focus:outline-none focus:ring-2 focus:ring-primary"
tabindex="-1"
>
</label>
></label>
<aside id="main-sidebar" class="sidebar" aria-label={gettext("Main navigation")}>
{sidebar_header(assigns)}
<%= if @current_user do %>
@ -174,8 +173,7 @@ defmodule MvWeb.Layouts.Sidebar do
<span
class="absolute -top-0.5 -right-0.5 size-2 rounded-full bg-primary"
aria-hidden="true"
>
</span>
></span>
<% end %>
</span>
<span class="menu-label">{@label}</span>