Фикс мержа

This commit is contained in:
IliaMiheev
2026-06-05 11:15:32 +03:00
parent cf65f74a6a
commit 1f2e1dd419
3 changed files with 25 additions and 16 deletions
+3
View File
@@ -9,6 +9,9 @@
html { html {
background-image: radial-gradient(#23aae3e2, #222222); background-image: radial-gradient(#23aae3e2, #222222);
background-repeat: no-repeat;
background-attachment: fixed;
} }
body { body {
+1
View File
@@ -89,6 +89,7 @@ useEventListener("keydown", handleKeydown);
.modal-footer { .modal-footer {
padding: 10px; padding: 10px;
display: flex; display: flex;
justify-content: flex-end;
} }
.modal-header { .modal-header {
+21 -16
View File
@@ -384,11 +384,11 @@ function onContextMenu(e, item) {
<p v-else>Выстройте маршрут перед сохранением кода.</p> <p v-else>Выстройте маршрут перед сохранением кода.</p>
</main> </main>
<template #footer> <template #footer>
<div v-if="listOfTrips.length"> <template v-if="listOfTrips.length">
<button @click="openPreviewFromModal">Предпросмотр</button> <button @click="openPreviewFromModal">Предпросмотр</button>
<button @click="handleDownloadBtn">Скачать код</button> <button @click="handleDownloadBtn">Скачать код</button>
<button @click="copyAndToast(finallyText)">Скопировать код</button> <button @click="copyAndToast(finallyText)">Скопировать код</button>
</div> </template>
</template> </template>
</MyDialog> </MyDialog>
</div> </div>
@@ -396,7 +396,8 @@ function onContextMenu(e, item) {
<style> <style>
:root { :root {
--side: 75px; --side: 8vh;
--sizeActions: 5vh;
} }
.wraper { .wraper {
@@ -409,36 +410,40 @@ function onContextMenu(e, item) {
display: grid; display: grid;
padding: 3px; padding: 3px;
grid-template-columns: repeat(10, var(--side)); grid-template-columns: repeat(10, var(--side));
grid-template-rows: repeat(10, var(--side));
gap: 5px; gap: 5px;
user-select: none; user-select: none;
} }
.square { .square {
width: var(--side); width: 100%;
height: var(--side); height: 100%;
text-align: center;
background-size: cover; background-size: cover;
border: 3px solid rgb(251, 251, 251); border: 3px solid #ffffff;
cursor: pointer; cursor: pointer;
overflow-y: scroll; overflow-y: scroll;
background-blend-mode: multiply; background-blend-mode: multiply;
background-color: transparent; background-color: #ffffff;
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
color: white; color: #2267fce2;
text-shadow: -1px -1px 0 black, text-shadow: -1px -1px 0 #fff,
1px -1px 0 black, 1px -1px 0 #fff,
-1px 1px 0 black, -1px 1px 0 #fff,
1px 1px 0 black; 1px 1px 0 #fff;
box-sizing: border-box; box-sizing: border-box;
font-size: 1.1rem;
font-weight: bold
} }
.square:hover { .square:hover {
background-color: rgb(166, 162, 162); background-color: #949494;
} }
.square:active { .square:active {
background-color: rgb(164, 162, 162); background-color: #747474;;
} }
.square::-webkit-scrollbar { .square::-webkit-scrollbar {
@@ -466,8 +471,8 @@ function onContextMenu(e, item) {
} }
.actions svg { .actions svg {
width: 40px; width: var(--sizeActions);
height: 40px; height: var(--sizeActions);
transition: color 0.4s; transition: color 0.4s;
} }