midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

UX: move theme pages above selectedElement, fix #2144

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-16 15:12:05 +02:00
parent 9faaad063d
commit d6f0e01067
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/UI/BigComponents/MenuDrawer.svelte
View file

@ -10,7 +10,7 @@
import CommunityIndexView from "./CommunityIndexView.svelte" import CommunityIndexView from "./CommunityIndexView.svelte"
import Community from "../../assets/svg/Community.svelte" import Community from "../../assets/svg/Community.svelte"
import LoginToggle from "../Base/LoginToggle.svelte" import LoginToggle from "../Base/LoginToggle.svelte"
import { CloseButton, Sidebar } from "flowbite-svelte" import { CloseButton } from "flowbite-svelte"
import HotkeyTable from "./HotkeyTable.svelte" import HotkeyTable from "./HotkeyTable.svelte"
import { Utils } from "../../Utils" import { Utils } from "../../Utils"
import Constants from "../../Models/Constants" import Constants from "../../Models/Constants"
@ -23,7 +23,6 @@
import MapillaryLink from "./MapillaryLink.svelte" import MapillaryLink from "./MapillaryLink.svelte"
import Github from "../../assets/svg/Github.svelte" import Github from "../../assets/svg/Github.svelte"
import Bug from "../../assets/svg/Bug.svelte" import Bug from "../../assets/svg/Bug.svelte"
import Add from "../../assets/svg/Add.svelte"
import CopyrightPanel from "./CopyrightPanel.svelte" import CopyrightPanel from "./CopyrightPanel.svelte"
import CopyrightAllIcons from "./CopyrightAllIcons.svelte" import CopyrightAllIcons from "./CopyrightAllIcons.svelte"
import LanguagePicker from "../InputElement/LanguagePicker.svelte" import LanguagePicker from "../InputElement/LanguagePicker.svelte"
@ -90,7 +89,7 @@
<LoginButton osmConnection={state.osmConnection} slot="not-logged-in" /> <LoginButton osmConnection={state.osmConnection} slot="not-logged-in" />
<div class="flex items-center gap-x-4"> <div class="flex items-center gap-x-4">
{#if $userdetails.img} {#if $userdetails.img}
<img src={$userdetails.img} class="h-14 w-14 rounded-full" /> <img alt="avatar" src={$userdetails.img} class="h-14 w-14 rounded-full" />
{/if} {/if}
<b>{$userdetails.name}</b> <b>{$userdetails.name}</b>
</div> </div>

5
src/UI/ThemeViewGUI.svelte
View file

@ -44,7 +44,7 @@
import DrawerLeft from "./Base/DrawerLeft.svelte" import DrawerLeft from "./Base/DrawerLeft.svelte"
import Hash from "../Logic/Web/Hash" import Hash from "../Logic/Web/Hash"
import { Drawer } from "flowbite-svelte" import { Drawer } from "flowbite-svelte"
import { linear, sineIn } from "svelte/easing" import { linear } from "svelte/easing"
export let state: ThemeViewState export let state: ThemeViewState
let layout = state.layout let layout = state.layout
@ -418,7 +418,6 @@
<MenuDrawer onlyLink={true} {state} /> <MenuDrawer onlyLink={true} {state} />
</div> </div>
</DrawerLeft> </DrawerLeft>
<MenuDrawer onlyLink={false} {state} />
{#if $selectedElement !== undefined && $selectedLayer !== undefined && !$selectedLayer.popupInFloatover} {#if $selectedElement !== undefined && $selectedLayer !== undefined && !$selectedLayer.popupInFloatover}
<!-- right modal with the selected element view --> <!-- right modal with the selected element view -->
@ -472,4 +471,6 @@
{/if} {/if}
{/if} {/if}
<MenuDrawer onlyLink={false} {state} />
</main> </main>