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

Update Label spacing #2336

Merged
merged 4 commits into from
Sep 23, 2024
Merged

Update Label spacing #2336

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ad6dbe
Update Combobox Label spacing to match Select
laurakwhit Sep 19, 2024
e49724e
Update Label spacing on Holocene components to match Select and Input
laurakwhit Sep 19, 2024
a1434a5
Update Label spacing on custom components
laurakwhit Sep 19, 2024
e9ada77
Merge branch 'codefreeze-09.12.24' into update-label-spacing
Alex-Tideman Sep 23, 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
2 changes: 1 addition & 1 deletion src/lib/components/schedule/schedule-input-payload.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
};
</script>

<div class="flex flex-col gap-4">
<div class="flex flex-col gap-1">
<Label for="schedule-input" label={translate('workflows.input')} />
<PayloadDecoder
value={payloads}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/holocene/combobox/combobox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
</script>

<MenuContainer {open} on:close={handleMenuClose}>
<Label hidden={labelHidden} {required} {label} for={id} />
<Label class="pb-1" hidden={labelHidden} {required} {label} for={id} />
<div class="combobox-wrapper" class:disabled class:invalid={!valid}>
{#if leadingIcon}
<Icon width={20} height={20} class="ml-2 shrink-0" name={leadingIcon} />
Expand Down
9 changes: 8 additions & 1 deletion src/lib/holocene/input/chip-input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,14 @@
</script>

<div class={merge(disabled && 'cursor-not-allowed', className)}>
<Label {required} {label} {disabled} hidden={labelHidden} for={id} />
<Label
class="pb-1"
{required}
{label}
{disabled}
hidden={labelHidden}
for={id}
/>
<div
bind:this={inputContainer}
class={merge(
Expand Down
2 changes: 1 addition & 1 deletion src/lib/holocene/orderable-list/orderable-list.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<style lang="postcss">
.orderable-section {
@apply flex flex-col gap-2;
@apply flex flex-col gap-1;
}

.orderable-list {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/holocene/textarea.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
export { className as class };
</script>

<div class={merge('group', className)}>
<div class={merge('group flex flex-col gap-1', className)}>
<Label {required} hidden={labelHidden} {label} for={id} />
{#if description}
<p class="pb-2 text-sm">{description}</p>
<p class="-mt-1 text-sm">{description}</p>
{/if}
<div
class={merge(
Expand Down Expand Up @@ -70,7 +70,7 @@
maxlength={maxLength > 0 ? maxLength : undefined}
/>
</div>
<div class="mt-2 flex justify-between gap-2">
<div class="flex justify-between gap-2">
<div
class="error-msg"
class:min-width={maxLength}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/pages/start-workflow.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
class="flex w-full flex-col items-end justify-between gap-4 md:flex-row"
>
{#if initialInput}
<div class="flex w-full flex-col gap-2 md:w-1/2">
<div class="flex w-full flex-col gap-1 md:w-1/2">
<Label
class="text-subtle"
for="workflow-example-input"
Expand All @@ -237,7 +237,7 @@
/>
</div>
{/if}
<div class="flex w-full flex-col gap-2 {initialInput && 'md:w-1/2'}">
<div class="flex w-full flex-col gap-1 {initialInput && 'md:w-1/2'}">
<div class="flex w-full items-end justify-between">
<Label for="workflow-input" label={translate('workflows.input')} />
<FileInput id="start-workflow-input-file-upload" {onUpload} />
Expand Down
Loading