Merge branch 'main' of https://github.com/circuitpython/web-editor into serial-file-transfer

makermelissa · makermelissa · commit 8312d7801233 · 2024-07-08T09:28:14.000-07:00
diff --git a/index.html b/index.html
@@ -12,7 +12,6 @@
 <body>
     <div id="blackout" class="body-blackout"></div>
     <div id="clickblock" class="body-blackout no-overlay"></div>
-
     <div class="layout">
         <header id="site-header">
             <div class="wrapper">
diff --git a/js/script.js b/js/script.js
@@ -588,6 +588,7 @@ document.addEventListener('DOMContentLoaded', async (event) => {
             }
         }
     } else {
+        await showMessage("USB Workflow is currently experiencing issues. See <a href=\"https://github.com/circuitpython/web-editor/issues/203\">GitHub issue #203</a> for more details. Please use Web Workflow.");
         await checkConnected();
     }
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "sass": "^1.77.6",
-    "vite": "^5.3.2"
+    "vite": "^5.3.3"
   },
   "dependencies": {
     "@adafruit/ble-file-transfer-js": "adafruit/ble-file-transfer-js#1.0.2",
diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss
@@ -133,6 +133,15 @@
     }
 }
 
+.popup-modal {
+    #message {
+        a {
+            color: #0062c7;
+            text-decoration: underline;
+        }
+    }
+}
+
 .mode-button {
     display: inline-block;
     font-size: 1.1em;

Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,7 @@ document.addEventListener('DOMContentLoaded', async (event) => {`
`588`	`588`	`}`
`589`	`589`	`}`
`590`	`590`	`} else {`
	`591`	`+ await showMessage("USB Workflow is currently experiencing issues. See <a href=\"https://github.com/circuitpython/web-editor/issues/203\">GitHub issue #203</a> for more details. Please use Web Workflow.");`
`591`	`592`	`await checkConnected();`
`592`	`593`	`}`
`593`	`594`	`});`