Merge fix
This commit is contained in:
parent
a10bd138ff
commit
910a077d19
|
@ -131,25 +131,17 @@
|
||||||
<Popover
|
<Popover
|
||||||
anchor={button}
|
anchor={button}
|
||||||
align="left"
|
align="left"
|
||||||
<<<<<<< HEAD
|
|
||||||
portalTarget={document.documentElement}
|
|
||||||
=======
|
|
||||||
>>>>>>> origin/develop
|
|
||||||
bind:this={popover}
|
bind:this={popover}
|
||||||
{open}
|
{open}
|
||||||
on:close={() => (open = false)}
|
on:close={() => (open = false)}
|
||||||
useAnchorWidth={!autoWidth}
|
useAnchorWidth={!autoWidth}
|
||||||
maxWidth={autoWidth ? 400 : null}
|
maxWidth={autoWidth ? 400 : null}
|
||||||
>
|
>
|
||||||
<<<<<<< HEAD
|
|
||||||
<div class="popover-content" class:auto-width={autoWidth}>
|
|
||||||
=======
|
|
||||||
<div
|
<div
|
||||||
class="popover-content"
|
class="popover-content"
|
||||||
class:auto-width={autoWidth}
|
class:auto-width={autoWidth}
|
||||||
use:clickOutside={() => (open = false)}
|
use:clickOutside={() => (open = false)}
|
||||||
>
|
>
|
||||||
>>>>>>> origin/develop
|
|
||||||
{#if autocomplete}
|
{#if autocomplete}
|
||||||
<Search
|
<Search
|
||||||
value={searchTerm}
|
value={searchTerm}
|
||||||
|
|
Loading…
Reference in New Issue