Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
TMuthu committed Dec 1, 2023
2 parents 4954c2a + f78a84f commit b5e2b1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
size: $$Props['size'] = 'sm';
export { className as class };
let _labelProps;
$: {
_labelProps = labelElement === 'label' ? { htmlFor: id, ...labelProps } : { ...labelProps };
}
$: ({ cx, classes, getStyles } = useStyles({ size }, { name: 'InputWrapper' }));
</script>

Expand All @@ -37,7 +33,7 @@
{...$$restProps}
>
{#if label}
<LabelElement class={classes.label} {..._labelProps} {label} {id} {labelElement} {required} />
<LabelElement class={classes.label} {...labelProps} {label} {id} {labelElement} {required} />
{/if}
{#if description}
<Text {...descriptionProps} color="gray" class={classes.description}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
</script>

<AppShell
fixed={false}
override={{
main: {
bc: isDark ? fns.themeColor('dark', 8) : fns.themeColor('gray', 0),
Expand All @@ -69,6 +70,7 @@
hiddenBreakpoint="sm"
width={{ base: '100%', sm: 300 }}
height={500}
fixed={false}
override={{ p: '$xsPX', bc: isDark ? fns.themeColor('dark', 7) : 'white' }}
>
<ShellSection grow>
Expand Down

0 comments on commit b5e2b1b

Please sign in to comment.