diff --git a/src/UI/Base/LoginToggle.svelte b/src/UI/Base/LoginToggle.svelte index 11d5eb0a36..f0dd140039 100644 --- a/src/UI/Base/LoginToggle.svelte +++ b/src/UI/Base/LoginToggle.svelte @@ -24,7 +24,8 @@ unknown: t.loginFailedUnreachableMode, readonly: t.loginFailedReadonlyMode, } - const apiState = state?.osmConnection?.apiIsOnline ?? new ImmutableStore("online") + const apiState = + state?.osmConnection?.apiIsOnline ?? new ImmutableStore("online") {#if $badge} diff --git a/src/UI/Base/NextButton.svelte b/src/UI/Base/NextButton.svelte index 687417b53f..3fa2b6c7f5 100644 --- a/src/UI/Base/NextButton.svelte +++ b/src/UI/Base/NextButton.svelte @@ -20,6 +20,8 @@
- = 0? "h-4 w-4 shrink-0": "h-12 w-12 shrink-0" }/> + = 0 ? "h-4 w-4 shrink-0" : "h-12 w-12 shrink-0"} + />
diff --git a/src/UI/Base/TabbedGroup.svelte b/src/UI/Base/TabbedGroup.svelte index 429909adca..b3aeb531a1 100644 --- a/src/UI/Base/TabbedGroup.svelte +++ b/src/UI/Base/TabbedGroup.svelte @@ -3,9 +3,9 @@ * Thin wrapper around 'TabGroup' which binds the state */ - import { Tab, TabGroup, TabList, TabPanel, TabPanels } from "@rgossiaux/svelte-headlessui"; - import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource"; - import { twJoin } from "tailwind-merge"; + import { Tab, TabGroup, TabList, TabPanel, TabPanels } from "@rgossiaux/svelte-headlessui" + import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource" + import { twJoin } from "tailwind-merge" /** * If a condition is given for a certain tab, it will only be shown if this condition is true. @@ -43,49 +43,63 @@
{#if $$slots.title0} - twJoin("tab", selected && "primary", !$condition0 && "hidden")}> + twJoin("tab", selected && "primary", !$condition0 && "hidden")} + >
Tab 0
{/if} {#if $$slots.title1} - twJoin("tab", selected && "primary", !$condition1 && "hidden")}> + twJoin("tab", selected && "primary", !$condition1 && "hidden")} + >
{/if} {#if $$slots.title2} - twJoin("tab", selected && "primary", !$condition2 && "hidden")}> + twJoin("tab", selected && "primary", !$condition2 && "hidden")} + >
{/if} {#if $$slots.title3} - twJoin("tab", selected && "primary", !$condition3 && "hidden")}> + twJoin("tab", selected && "primary", !$condition3 && "hidden")} + >
{/if} {#if $$slots.title4} - twJoin("tab", selected && "primary", !$condition4 && "hidden")}> + twJoin("tab", selected && "primary", !$condition4 && "hidden")} + >
{/if} {#if $$slots.title5} - twJoin("tab", selected && "primary", !$condition5 && "hidden")}> + twJoin("tab", selected && "primary", !$condition5 && "hidden")} + >
{/if} {#if $$slots.title6} - twJoin("tab", selected && "primary", !$condition6 && "hidden")}> + twJoin("tab", selected && "primary", !$condition6 && "hidden")} + >
diff --git a/src/UI/BigComponents/SelectedElementView.svelte b/src/UI/BigComponents/SelectedElementView.svelte index efa54cf297..c780ea931f 100644 --- a/src/UI/BigComponents/SelectedElementView.svelte +++ b/src/UI/BigComponents/SelectedElementView.svelte @@ -28,7 +28,7 @@ {:else} -
+
{#each layer.tagRenderings as config (config.id)} {#if (config.condition?.matchesProperties($tags) ?? true) && config.metacondition?.matchesProperties({ ...$tags, ..._metatags } ?? true)} {#if config.IsKnown($tags)} diff --git a/src/UI/DownloadFlow/DownloadPanel.svelte b/src/UI/DownloadFlow/DownloadPanel.svelte index 05688a5e68..9fab44c75b 100644 --- a/src/UI/DownloadFlow/DownloadPanel.svelte +++ b/src/UI/DownloadFlow/DownloadPanel.svelte @@ -27,7 +27,7 @@ mapExtent: state.mapProperties.bounds.data, width: maindiv.offsetWidth, height: maindiv.offsetHeight, - noSelfIntersectingLines: true + noSelfIntersectingLines: true, }) } @@ -84,7 +84,7 @@ helperText={t.downloadAsSvgLinesOnlyHelper} construct={() => offerSvg(true)} /> - + - import {UIEventSource} from "../../../Logic/UIEventSource"; + import { UIEventSource } from "../../../Logic/UIEventSource" - /** - * Simply shows the image - */ - export let value: UIEventSource + /** + * Simply shows the image + */ + export let value: UIEventSource - + diff --git a/src/UI/InputElement/Helpers/SimpleTagInput.svelte b/src/UI/InputElement/Helpers/SimpleTagInput.svelte index 9af4a549d5..bee89682e5 100644 --- a/src/UI/InputElement/Helpers/SimpleTagInput.svelte +++ b/src/UI/InputElement/Helpers/SimpleTagInput.svelte @@ -1,31 +1,39 @@ - - - + {#if $dropdownFocussed} -
- {documentation.name} - +
+ {documentation.name} +
{/if} diff --git a/src/UI/InputElement/Helpers/TagInput.svelte b/src/UI/InputElement/Helpers/TagInput.svelte index 7144268b84..23576ac277 100644 --- a/src/UI/InputElement/Helpers/TagInput.svelte +++ b/src/UI/InputElement/Helpers/TagInput.svelte @@ -1,22 +1,21 @@ - - - + diff --git a/src/UI/InputElement/Helpers/TranslationInput.svelte b/src/UI/InputElement/Helpers/TranslationInput.svelte index 821eea8015..5acca61727 100644 --- a/src/UI/InputElement/Helpers/TranslationInput.svelte +++ b/src/UI/InputElement/Helpers/TranslationInput.svelte @@ -1,55 +1,59 @@ -
+ +
- {prefix} + {prefix} - dispatch("submit")} /> + dispatch("submit")} + /> - {postfix} + {postfix}
diff --git a/src/UI/InputElement/InputHelper.svelte b/src/UI/InputElement/InputHelper.svelte index 0d5906698c..27bc2bfdf2 100644 --- a/src/UI/InputElement/InputHelper.svelte +++ b/src/UI/InputElement/InputHelper.svelte @@ -4,50 +4,49 @@ * Note that all values are stringified */ - import { UIEventSource } from "../../Logic/UIEventSource"; - import type { ValidatorType } from "./Validators"; - import InputHelpers from "./InputHelpers"; - import ToSvelte from "../Base/ToSvelte.svelte"; - import type { Feature } from "geojson"; - import { createEventDispatcher } from "svelte"; - import ImageHelper from "./Helpers/ImageHelper.svelte"; - import TranslationInput from "./Helpers/TranslationInput.svelte"; - import TagInput from "./Helpers/TagInput.svelte"; - import SimpleTagInput from "./Helpers/SimpleTagInput.svelte"; - import DirectionInput from "./Helpers/DirectionInput.svelte"; - import DateInput from "./Helpers/DateInput.svelte"; - import ColorInput from "./Helpers/ColorInput.svelte"; - import OpeningHoursInput from "./Helpers/OpeningHoursInput.svelte"; + import { UIEventSource } from "../../Logic/UIEventSource" + import type { ValidatorType } from "./Validators" + import InputHelpers from "./InputHelpers" + import ToSvelte from "../Base/ToSvelte.svelte" + import type { Feature } from "geojson" + import { createEventDispatcher } from "svelte" + import ImageHelper from "./Helpers/ImageHelper.svelte" + import TranslationInput from "./Helpers/TranslationInput.svelte" + import TagInput from "./Helpers/TagInput.svelte" + import SimpleTagInput from "./Helpers/SimpleTagInput.svelte" + import DirectionInput from "./Helpers/DirectionInput.svelte" + import DateInput from "./Helpers/DateInput.svelte" + import ColorInput from "./Helpers/ColorInput.svelte" + import OpeningHoursInput from "./Helpers/OpeningHoursInput.svelte" - export let type: ValidatorType; - export let value: UIEventSource; + export let type: ValidatorType + export let value: UIEventSource - export let feature: Feature; - export let args: (string | number | boolean)[] = undefined; + export let feature: Feature + export let args: (string | number | boolean)[] = undefined - let properties = { feature, args: args ?? [] }; + let properties = { feature, args: args ?? [] } let dispatch = createEventDispatcher<{ selected - }>(); - + }>() -{#if type === "translation" } +{#if type === "translation"} {:else if type === "direction"} {:else if type === "date"} - + {:else if type === "color"} - + {:else if type === "image"} - + {:else if type === "tag"} - + {:else if type === "simple_tag"} - + {:else if type === "opening_hours"} - + {:else if type === "wikidata"} InputHelpers.constructWikidataHelper(value, properties)} /> {/if} diff --git a/src/UI/InputElement/ValidatedInput.svelte b/src/UI/InputElement/ValidatedInput.svelte index 2c34301029..416db5347f 100644 --- a/src/UI/InputElement/ValidatedInput.svelte +++ b/src/UI/InputElement/ValidatedInput.svelte @@ -1,145 +1,156 @@ {#if validator?.textArea} -
sendSubmit()}> - - -
+
sendSubmit()}> +