Skip to content

Commit 6944bce

Browse files
authored
Merge pull request #1154 from naymspace/feature/design-improvements
minor design improvements in multi select
2 parents 2dea3f2 + 63bc3a0 commit 6944bce

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

lib/backpex/fields/has_many.ex

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,23 @@ defmodule Backpex.Fields.HasMany do
161161
{@prompt}
162162
</p>
163163
164-
<div :for={{label, value} <- @selected} class="badge badge-sm badge-primary pointer-events-auto pr-0">
164+
<div
165+
:for={{label, value} <- @selected}
166+
class="badge badge-sm badge-soft badge-primary pointer-events-auto pr-0"
167+
>
165168
<span>{label}</span>
166169
<label
167170
class="flex cursor-pointer items-center pr-2"
168171
role="button"
169172
for={"has-many-#{@name}-checkbox-value-#{value}"}
170173
aria-label={Backpex.__({"Unselect %{label}", %{label: label}}, @live_resource)}
171174
>
172-
<Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="text-primary-content size-4" />
175+
<Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="size-4 scale-105 hover:scale-110" />
173176
</label>
174177
</div>
175178
</div>
176179
</label>
177-
<Form.error :for={msg <- @errors}>{msg}</Form.error>
180+
<Form.error :for={msg <- @errors} class="mt-1">{msg}</Form.error>
178181
<div tabindex="0" class="dropdown-content z-[1] menu bg-base-100 rounded-box w-full overflow-y-auto shadow">
179182
<div class="max-h-72 p-2">
180183
<input

lib/backpex/fields/multi_select.ex

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,10 @@ defmodule Backpex.Fields.MultiSelect do
128128
~H"""
129129
<div class={[@live_action in [:index, :resource_action] && "truncate"]}>
130130
{if @selected_labels == [], do: raw("&mdash;")}
131-
132-
<div class={["flex", @live_action == :show && "flex-wrap"]}>
133-
<.intersperse :let={item} enum={@selected_labels}>
134-
<:separator>
135-
,&nbsp;
136-
</:separator>
137-
<p>
138-
{HTML.pretty_value(item)}
139-
</p>
140-
</.intersperse>
131+
<div class="space-x-1">
132+
<div :for={item <- @selected_labels} class="badge badge-sm badge-soft badge-primary">
133+
<span>{HTML.pretty_value(item)}</span>
134+
</div>
141135
</div>
142136
</div>
143137
"""

lib/backpex/html/form.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ defmodule Backpex.HTML.Form do
282282
{@prompt}
283283
</p>
284284
285-
<div :for={{label, value} <- @selected} class="badge badge-sm badge-primary pointer-events-auto pr-0">
285+
<div :for={{label, value} <- @selected} class="badge badge-sm badge-soft badge-primary pointer-events-auto pr-0">
286286
{label}
287287
<div
288288
class="flex cursor-pointer items-center pr-2"
@@ -292,7 +292,7 @@ defmodule Backpex.HTML.Form do
292292
phx-target={@event_target}
293293
aria-label={Backpex.__({"Unselect %{label}", %{label: label}}, @live_resource)}
294294
>
295-
<Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="text-primary-content size-4 scale-110" />
295+
<Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="size-4 scale-105 hover:scale-110" />
296296
</div>
297297
</div>
298298
</div>

0 commit comments

Comments
 (0)