Skip to content

Commit

Permalink
format, merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsMeBrianD committed Feb 11, 2025
1 parent 009cc01 commit 644dbe4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
$: fieldDisabled = disabled || spec.forceReference || (spec.references && refVal !== null);
const inputClasses = "rounded-md border border-base-300 bg-base-100 shadow-sm px-2 py-1 text-sm focus-visible:ring-base-300 flex h-9 w-full transition-colors focus-visible:outline-none focus-visible:ring-1 p-1 ml-auto align-middle"
const inputClasses =
'rounded-md border border-base-300 bg-base-100 shadow-sm px-2 py-1 text-sm focus-visible:ring-base-300 flex h-9 w-full transition-colors focus-visible:outline-none focus-visible:ring-1 p-1 ml-auto align-middle';
</script>
<div class="w-full mb-2">
Expand All @@ -164,15 +164,15 @@
{#if spec.type === 'string'}
{#if spec.secret && !reveal && spec.shown !== true}
<input
class="{inputClasses}"
class={inputClasses}
disabled={fieldDisabled}
required={spec.required}
type="password"
bind:value={fieldValue}
/>
{:else}
<input
class="{inputClasses}"
class={inputClasses}
disabled={fieldDisabled}
required={spec.required}
type="text"
Expand All @@ -184,18 +184,14 @@
></textarea>
{:else if spec.type === 'number'}
<input
class="{inputClasses}"
class={inputClasses}
disabled={fieldDisabled}
required={spec.required}
type="number"
bind:value={fieldValue}
/>
{:else if spec.type === 'select' && Array.isArray(spec.options)}
<select
disabled={fieldDisabled}
bind:value={fieldValue}
class="{inputClasses}"
>
<select disabled={fieldDisabled} bind:value={fieldValue} class={inputClasses}>
<option disabled={spec.required} value={undefined} />
{#each spec.options as option}
{#if typeof option === 'string'}
Expand Down Expand Up @@ -236,4 +232,4 @@
/>
</div>
{/if}
</div>
</div>
6 changes: 3 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 644dbe4

Please sign in to comment.