* Revert "FIX: Defer removing the splash screen until the window load event fires (#17225)" This reverts commit6a61e855b3
. * Revert "FIX: Remove splash screen in no-js view (#17223)" This reverts commit5257cae1b8
.
This commit is contained in:
parent
7d41e980c9
commit
07cb8e5300
|
@ -82,14 +82,8 @@ const Discourse = Application.extend({
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
window.addEventListener(
|
// The app booted. Remove the splash screen
|
||||||
"load",
|
document.querySelector("#d-splash")?.remove();
|
||||||
() => {
|
|
||||||
// The app booted. Remove the splash screen
|
|
||||||
document.querySelector("#d-splash")?.remove();
|
|
||||||
},
|
|
||||||
{ once: true }
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
_registerPluginCode(version, code) {
|
_registerPluginCode(version, code) {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<style>
|
<style>
|
||||||
html {
|
html {
|
||||||
background: var(--secondary);
|
background: var(--secondary);
|
||||||
overflow-y: hidden !important;
|
overflow: hidden !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
#d-splash {
|
#d-splash {
|
||||||
|
@ -29,7 +29,6 @@
|
||||||
animation: fade-in 0.5s ease-in-out;
|
animation: fade-in 0.5s ease-in-out;
|
||||||
animation-delay: 2.5s;
|
animation-delay: 2.5s;
|
||||||
animation-fill-mode: forwards;
|
animation-fill-mode: forwards;
|
||||||
color: var(--primary);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#d-splash .preloader-text:after {
|
#d-splash .preloader-text:after {
|
||||||
|
@ -80,17 +79,5 @@
|
||||||
<div class="preloader-text">
|
<div class="preloader-text">
|
||||||
<span> <%= I18n.t("js.preloader_text") %> </span>
|
<span> <%= I18n.t("js.preloader_text") %> </span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<noscript>
|
|
||||||
<style>
|
|
||||||
html {
|
|
||||||
overflow-y: initial !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#d-splash {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</noscript>
|
|
||||||
</section>
|
</section>
|
||||||
<%- end %>
|
<%- end %>
|
||||||
|
|
Loading…
Reference in New Issue