Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CoreComponents margin between inputs and labels #5884

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix CoreComponents margin between inputs and labels #5884

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb5b2e4
feat(core-component): add mb-2 to optional labels and remove mt-2 fro…
NTurchi Jul 28, 2024
2fd81e7
fix: move class after for in label
NTurchi Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions priv/templates/phx.gen.live/core_components.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,11 @@ defmodule <%= @web_namespace %>.CoreComponents do
def input(%{type: "select"} = assigns) do
~H"""
<div>
<.label for={@id}><%%= @label %></.label>
<.label for={@id} class="mb-2"><%%= @label %></.label>
<select
id={@id}
name={@name}
class="mt-2 block w-full rounded-md border border-gray-300 bg-white shadow-sm focus:border-zinc-400 focus:ring-0 sm:text-sm"
class="block w-full rounded-md border border-gray-300 bg-white shadow-sm focus:border-zinc-400 focus:ring-0 sm:text-sm"
multiple={@multiple}
{@rest}
>
Expand All @@ -350,12 +350,12 @@ defmodule <%= @web_namespace %>.CoreComponents do
def input(%{type: "textarea"} = assigns) do
~H"""
<div>
<.label for={@id}><%%= @label %></.label>
<.label for={@id} class="mb-2"><%%= @label %></.label>
<textarea
id={@id}
name={@name}
class={[
"mt-2 block w-full rounded-lg text-zinc-900 focus:ring-0 sm:text-sm sm:leading-6 min-h-[6rem]",
"block w-full rounded-lg text-zinc-900 focus:ring-0 sm:text-sm sm:leading-6 min-h-[6rem]",
@errors == [] && "border-zinc-300 focus:border-zinc-400",
@errors != [] && "border-rose-400 focus:border-rose-400"
]}
Expand All @@ -370,14 +370,14 @@ defmodule <%= @web_namespace %>.CoreComponents do
def input(assigns) do
~H"""
<div>
<.label for={@id}><%%= @label %></.label>
<.label for={@id} class="mb-2"><%%= @label %></.label>
<input
type={@type}
name={@name}
id={@id}
value={Phoenix.HTML.Form.normalize_value(@type, @value)}
class={[
"mt-2 block w-full rounded-lg text-zinc-900 focus:ring-0 sm:text-sm sm:leading-6",
"block w-full rounded-lg text-zinc-900 focus:ring-0 sm:text-sm sm:leading-6",
@errors == [] && "border-zinc-300 focus:border-zinc-400",
@errors != [] && "border-rose-400 focus:border-rose-400"
]}
Expand All @@ -391,12 +391,14 @@ defmodule <%= @web_namespace %>.CoreComponents do
@doc """
Renders a label.
"""
attr :class, :string, default: nil
attr :for, :string, default: nil

slot :inner_block, required: true

def label(assigns) do
~H"""
<label for={@for} class="block text-sm font-semibold leading-6 text-zinc-800">
<label for={@for} class={["block text-sm font-semibold leading-6 text-zinc-800"], @class}>
<%%= render_slot(@inner_block) %>
</label>
"""
Expand Down