From 5257cae1b804c61064de417c7046478cebd99752 Mon Sep 17 00:00:00 2001
From: Joe <33972521+hnb-ku@users.noreply.github.com>
Date: Fri, 24 Jun 2022 09:25:10 +0800
Subject: [PATCH] FIX: Remove splash screen in no-js view (#17223)

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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/views/common/_discourse_splash.html.erb b/app/views/common/_discourse_splash.html.erb
index 5e6fe84ea01..993634f3bae 100644
--- a/app/views/common/_discourse_splash.html.erb
+++ b/app/views/common/_discourse_splash.html.erb
@@ -3,7 +3,7 @@
   <style>
     html {
       background: var(--secondary);
-      overflow: hidden !important;
+      overflow-y: hidden !important;
     }
 
     #d-splash {
@@ -29,6 +29,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 +80,17 @@
   <div class="preloader-text">
     <span> <%= I18n.t("js.preloader_text") %> </span>
   </div>
+
+  <noscript>
+    <style>
+      html {
+        overflow-y: initial !important;
+      }
+
+      #d-splash {
+        display: none;
+      }
+    </style>
+  </noscript>
 </section>
 <%- end %>