Merge branch 'feature/#321' of ssh://gitea.directonline.io:29417/noxious/client into feature/#321
# Conflicts: # src/components/gameMaster/mapEditor/partials/Toolbar.vue
This commit is contained in:
commit
3bcb16fa9c
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="flex flex-col items-center px-5 fixed bottom-24 left-0 z-20">
|
||||
<div class="toolbar rounded flex bg-gray solid border-solid border-2 border-gray-500 text-gray-300 p-1.5 px-3 h-10 space-x-2">
|
||||
<div class="flex flex-col items-center px-5 py-1 fixed bottom-20 left-0 z-20">
|
||||
<div class="flex h-10 gap-2">
|
||||
<button @mousedown.stop @click="handleDelete" class="btn-red !py-3 px-4">
|
||||
<img src="/assets/icons/trashcan.svg" class="w-4 h-4" alt="Delete" />
|
||||
</button>
|
||||
|
Loading…
x
Reference in New Issue
Block a user