From e993a23a5406dd4188f600939d2e789774adabcd Mon Sep 17 00:00:00 2001
From: Joe <33972521+hnb-ku@users.noreply.github.com>
Date: Fri, 24 Jun 2022 17:38:42 +0800
Subject: [PATCH] FIX: Remove splash screen in no-js view take 2 (#17229)

We use javascript to remove the splash screen when the site boots up. If the user has js disabled, they get stuck on the splash screen.

If the user has js disabled. We don't show the splash screen at all.
---
 app/views/common/_discourse_splash.html.erb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/views/common/_discourse_splash.html.erb b/app/views/common/_discourse_splash.html.erb
index 5e6fe84ea01..747d5352d9d 100644
--- a/app/views/common/_discourse_splash.html.erb
+++ b/app/views/common/_discourse_splash.html.erb
@@ -3,7 +3,6 @@
   <style>
     html {
       background: var(--secondary);
-      overflow: hidden !important;
     }
 
     #d-splash {
@@ -29,6 +28,7 @@
       animation: fade-in 0.5s ease-in-out;
       animation-delay: 2.5s;
       animation-fill-mode: forwards;
+      color: var(--primary);
     }
 
     #d-splash .preloader-text:after {
@@ -79,5 +79,17 @@
   <div class="preloader-text">
     <span> <%= I18n.t("js.preloader_text") %> </span>
   </div>
+
+  <noscript>
+    <style>
+      html {
+        background: revert;
+      }
+
+      #d-splash {
+        display: none;
+      }
+    </style>
+  </noscript>
 </section>
 <%- end %>