merge unconflict

2025-10-06 15:44:12 +02:00
parent d7650c927e a55b1f0250
commit a71d798622
38 changed files with 492 additions and 136 deletions
--- a/static/icon.ico
+++ b/static/icon.ico
--- a/static/icon.png
+++ b/static/icon.png
--- a/static/shiggy.gif
+++ b/static/shiggy.gif
--- a/static/splash.webp
+++ b/static/splash.webp
--- a/static/tray.png
+++ b/static/tray.png
--- a/static/tray/tray.png
+++ b/static/tray/tray.png
--- a/static/tray/trayTemplate.png
+++ b/static/tray/trayTemplate.png
--- a/static/tray/trayUnread.png
+++ b/static/tray/trayUnread.png
--- a/static/views/splash.html
+++ b/static/views/splash.html
@@ -36,19 +36,14 @@
        img {
            width: 128px;
            height: 128px;
-            image-rendering: pixelated;
+            object-fit: contain;
        }
    </style>
 </head>

 <body>
    <div class="wrapper">
-        <img
-            draggable="false"
-            src="../shiggy.gif"
-            alt="shiggy"
-            role="presentation"
-        />
+        <img draggable="false" src="vesktop://assets/splash" alt="" role="presentation" />
        <p>Loading Vesktop...</p>
        <p class="message"></p>
    </div>
@@ -61,4 +56,4 @@
            messageElement.textContent = message;
        })
    });
-</script>
+</script>