Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
tooltip?: string | undefined
shouldDisplayLeft?: boolean
shouldDisplayRight?: boolean
overriden?: boolean
overridding?: boolean
overridden?: boolean
overriding?: boolean
wmClass?: string | undefined
}

Expand All @@ -45,8 +45,8 @@
tooltip = undefined,
shouldDisplayLeft = false,
shouldDisplayRight = false,
overriden = false,
overridding = false,
overridden = false,
overriding = false,
wmClass = undefined
}: Props = $props()

Expand Down Expand Up @@ -143,9 +143,9 @@
<div class="text-xs font-medium text-primary"> Plain CSS </div>

<div class="flex flex-row gap-1">
{#if overriden}
<Badge color="red" small>Overriden by local</Badge>
{:else if overridding}
{#if overridden}
<Badge color="red" small>Overridden by local</Badge>
{:else if overriding}
<Badge color="blue" small>Overriding global</Badge>
{/if}
{#if quickStyleProperties?.length}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
forceClass?: boolean
id: string
property?: ComponentCssProperty | undefined
overriden?: boolean
overridding?: boolean
overridden?: boolean
overriding?: boolean
wmClass?: string | undefined
}

Expand All @@ -17,8 +17,8 @@
forceClass = false,
id,
property = $bindable(undefined),
overriden = false,
overridding = false,
overridden = false,
overriding = false,
wmClass = undefined
}: Props = $props()

Expand All @@ -38,8 +38,8 @@
shouldDisplayLeft={hasValues(property[id])}
on:left
on:right
{overriden}
{overridding}
{overridden}
{overriding}
{wmClass}
/>
{/if}
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
copyLocalToGlobal(name, component?.customCss?.[name])
tab = 'global'
}}
overridding={hasStyleValue($app.css?.[component.type]?.[name]) &&
overriding={hasStyleValue($app.css?.[component.type]?.[name]) &&
hasStyleValue(component.customCss[name])}
/>
</div>
Expand All @@ -277,7 +277,7 @@
)
tab = 'local'
}}
overriden={hasStyleValue(component.customCss[id])}
overridden={hasStyleValue(component.customCss[id])}
wmClass={getSelector(id)}
/>
{/if}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/script_helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const NATIVETS_INIT_CODE = `// Fetch-only script, no imports allowed (except win
//import * as wmill from './windmill.ts'

export async function main(example_input: number = 3) {
// "3" is the default value of example_input, it can be overriden with code or using the UI
// "3" is the default value of example_input, it can be overridden with code or using the UI
const res = await fetch(\`https://jsonplaceholder.typicode.com/todos/\${example_input}\`, {
headers: { "Content-Type": "application/json" },
});
Expand All @@ -101,7 +101,7 @@ const BUNNATIVE_INIT_CODE = `//native
//import * as wmill from "windmill-client"

export async function main(example_input: number = 3) {
// "3" is the default value of example_input, it can be overriden with code or using the UI
// "3" is the default value of example_input, it can be overridden with code or using the UI
const res = await fetch(\`https://jsonplaceholder.typicode.com/todos/\${example_input}\`, {
headers: { "Content-Type": "application/json" },
});
Expand Down
Loading