Merge develop

This commit is contained in:
Pieter Vander Vennet 2025-01-21 21:14:11 +01:00
commit 4fdae55c97
206 changed files with 8760 additions and 3718 deletions

View file

@ -126,12 +126,6 @@
</svelte:fragment>
<!-- All shown components are set by 'usersettings.json', which happily uses some special visualisations created specifically for it -->
<LoginToggle {state} silentFail>
<div class="flex flex-col" slot="not-logged-in">
<LanguagePicker availableLanguages={theme.language} />
<Tr cls="alert" t={Translations.t.userinfo.notLoggedIn} />
<LoginButton clss="primary" osmConnection={state.osmConnection} />
</div>
<SelectedElementView
highlightedRendering={state.guistate.highlightedUserSetting}
layer={usersettingslayer}
@ -143,7 +137,6 @@
{state}
tags={state.userRelatedState.preferencesAsTags}
/>
</LoginToggle>
</Page>
<LoginToggle {state} silentFail>

View file

@ -57,11 +57,17 @@
<Tr t={theme.descriptionTail} />
{#if !theme.official}
<div class="flex w-full justify-end">
<button class="flex small w-fit self-end as-link" on:click={() => Utils.offerContentsAsDownloadableFile(JSON.stringify(theme.source, null, " "), theme.id+".mapcomplete_theme.json")}>
Download the theme definition
</button>
</div>
<button
class="small as-link flex w-fit self-end"
on:click={() =>
Utils.offerContentsAsDownloadableFile(
JSON.stringify(theme.source, null, " "),
theme.id + ".mapcomplete_theme.json"
)}
>
Download the theme definition
</button>
</div>
{/if}
<!-- Buttons: open map, go to location, search -->
<NextButton
@ -110,7 +116,6 @@
{/if}
</div>
<div class="link-underline mt-8 flex justify-end text-sm">
<a href="https://mapcomplete.org" target="_blank">
<Tr t={Translations.t.general.poweredByMapComplete} />