mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-20 00:02:19 +00:00
Merge remote-tracking branch 'origin/main' into glm/session-editor-small
# Conflicts: # frontend/src/lib/components/ScriptBuilder.svelte
This commit is contained in:
@@ -412,7 +412,7 @@ leaves and ignores the current scope.
|
||||
bind:this={pickerRoot}
|
||||
class={flush
|
||||
? 'flex flex-col w-full h-full'
|
||||
: 'flex flex-col w-[min(420px,calc(100vw-20px))] max-h-[60vh]'}
|
||||
: 'flex flex-col w-[min(420px,calc(100vw-20px))] max-h-[60vh] min-h-0'}
|
||||
onkeydown={handleSearchKeydown}
|
||||
onmousemove={() => (mouseActive = true)}
|
||||
>
|
||||
|
||||
@@ -1102,7 +1102,7 @@
|
||||
<ScriptEditorDrawer bind:this={$scriptEditorDrawer} />
|
||||
<FlowEditorDrawer bind:this={$flowEditorDrawer} />
|
||||
|
||||
<div bind:this={flowBuilderRoot} class="flex flex-col h-screen">
|
||||
<div bind:this={flowBuilderRoot} class="flex flex-col h-full">
|
||||
<!-- Nav between steps-->
|
||||
<div
|
||||
bind:clientWidth={topbarWidth}
|
||||
|
||||
@@ -1902,7 +1902,7 @@
|
||||
</DrawerContent>
|
||||
</Drawer>
|
||||
|
||||
<div class="flex flex-col h-screen">
|
||||
<div class="flex flex-col h-full">
|
||||
<div
|
||||
bind:clientWidth={topbarWidth}
|
||||
class="flex items-center px-4 {condensedHeader ? 'h-9' : 'h-12'}"
|
||||
|
||||
@@ -1648,10 +1648,7 @@
|
||||
gateJobIds={false}
|
||||
extraSourceWindow={() => externalPreviewWindow}
|
||||
/>
|
||||
<div
|
||||
bind:clientWidth={rootWidth}
|
||||
class="max-h-screen overflow-hidden h-screen min-h-0 flex flex-col"
|
||||
>
|
||||
<div bind:clientWidth={rootWidth} class="max-h-full overflow-hidden h-full min-h-0 flex flex-col">
|
||||
<RawAppEditorHeader
|
||||
bind:jobs
|
||||
bind:jobsById
|
||||
|
||||
@@ -655,6 +655,7 @@
|
||||
enableFlyTransition
|
||||
bind:isOpen={activeTabPickerOpen}
|
||||
openFocus="[data-workspace-picker-search]"
|
||||
contentClasses="flex flex-col overflow-hidden"
|
||||
class="flex items-center shrink-0 cursor-pointer text-tertiary hover:text-primary"
|
||||
>
|
||||
{#snippet trigger()}
|
||||
@@ -685,6 +686,7 @@
|
||||
bind:isOpen={newTabOpen}
|
||||
enableFlyTransition
|
||||
openFocus="[data-workspace-picker-search]"
|
||||
contentClasses="flex flex-col overflow-hidden"
|
||||
class="shrink-0 inline-flex items-center justify-center w-6 h-6 rounded text-tertiary hover:text-primary hover:bg-surface-hover cursor-pointer"
|
||||
>
|
||||
{#snippet trigger()}
|
||||
@@ -753,6 +755,7 @@
|
||||
bind:isOpen={emptyStateNewTabOpen}
|
||||
enableFlyTransition
|
||||
openFocus="[data-workspace-picker-search]"
|
||||
contentClasses="flex flex-col overflow-hidden"
|
||||
>
|
||||
{#snippet trigger()}
|
||||
<span
|
||||
|
||||
Reference in New Issue
Block a user