Loading screen fixes among other things

3r1s-s · Sep 7, 2024 · 8a10f5b · 8a10f5b
1 parent d10811a
commit 8a10f5b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/index.html b/index.html
@@ -9,8 +9,8 @@
     <link rel="apple-touch-icon" sizes="180x180" href="images/meo.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="description" content="Neo + Meower">
-    <meta name="theme-color" content="#1c1c26">
-    <meta name="background-color" content="#1c1c26">
+    <meta name="theme-color" content="#1f1d29">
+    <meta name="background-color" content="#1f1d29">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta class="special" property="og:image" content="images/meo.png">
     <link rel="canonical" href="https://eris.pages.dev/meo/"/>
@@ -33,6 +33,14 @@
     <link rel="stylesheet" href="scheme.css">
     <link rel="stylesheet" href="glass.css">
     <link rel="stylesheet" href="tooltips.css">
+    <style>
+      html {
+        background-color: #1f1d29;
+      }
+      body {
+        display: none;
+      }
+    </style>
     <style id="customtheme">
       .custom-theme {
           --primary: #15a4c1;
@@ -122,8 +130,8 @@
       });
     </script>
     <script src="https://cdn.jsdelivr.net/gh/JoshAtticus/leo@main/plugins.js" type="text/javascript"></script>
-    <script src="script.js" type="text/javascript"></script>
     <script src="markdown.js" type="text/javascript"></script>
+    <script src="script.js" type="text/javascript"></script>
     <script src="emoji.js" type="text/javascript"></script>
     <script type="text/javascript">
       window.addEventListener("beforeinstallprompt", function (e) {

diff --git a/script.js b/script.js
@@ -26,6 +26,7 @@ if (settingsstuff().homepage) {
 } else {
     pre = "start"
 }
+let loadpre = 0;
 let meourl = 'https://eris.pages.dev/meo';
 
 let bridges = ['Discord', 'SplashBridge', 'gc'];
@@ -168,6 +169,7 @@ function main() {
     }
 
     meowerConnection.onopen = () => {
+        document.querySelector('#loading').style.setProperty('--load', `100%`);
         if (localStorage.getItem("token") != undefined && localStorage.getItem("username") != undefined) {
             meowerConnection.send(JSON.stringify({
                 cmd: "authpswd",
@@ -6030,27 +6032,6 @@ function createModal(data) {
     }
 }
 
-load()
-
-function load() {
-    const loading = document.querySelector('#loading');
-    if (loading) {
-        let loadpre = 0;
-        const interval = setInterval(() => {
-            loadpre += Math.random() * 5;
-            loading.style.setProperty('--load', `${loadpre}%`);
-
-
-            if (loadpre >= 100) {
-                clearInterval(interval);
-                meoStart();
-            }
-        }, 25);
-    }
-}
-
 // work on this
-function meoStart() {
-    main();
-    setInterval(ping, 25000);
-}
+main();
+setInterval(ping, 25000);
diff --git a/styles.css b/styles.css
@@ -17,6 +17,7 @@ body {
     background-size: cover;
     background-repeat: no-repeat;
     background-attachment: fixed;
+    display: block !important;
 }
 
 input {
@@ -1124,6 +1125,7 @@ possible future styling
 
 .ext-icon {
     border-radius: 15px;
+    user-select: none;
 }
 
 .icon {
@@ -3169,6 +3171,7 @@ possible future styling
     box-sizing: border-box;
     border-top-right-radius: 100px;
     border-bottom-right-radius: 100px;
+    transition: width 0.05s ease-in-out;
 /*    box-shadow: inset 0px -4px 15px #07060880; */
 }