mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-20 02:00:04 +00:00
Merge branch 'main' into bomb-confirmation
This commit is contained in:
Ryan
+34
-27
@@ -120,9 +120,22 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<!-- Immediate execution to prevent FOUC -->
|
||||
<!-- Immediate execution to prevent FOUC + apply persisted dark mode -->
|
||||
<script>
|
||||
document.documentElement.className = "preload";
|
||||
(function () {
|
||||
const root = document.documentElement;
|
||||
root.classList.add("preload");
|
||||
try {
|
||||
const storedDarkMode = localStorage.getItem("settings.darkMode");
|
||||
if (storedDarkMode === "true") {
|
||||
root.classList.add("dark");
|
||||
} else if (storedDarkMode === "false") {
|
||||
root.classList.remove("dark");
|
||||
}
|
||||
} catch (error) {
|
||||
// Ignore storage access errors.
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
|
||||
<!-- CrazyGames SDK -->
|
||||
@@ -183,7 +196,7 @@
|
||||
</head>
|
||||
|
||||
<body
|
||||
class="h-full select-none font-sans min-h-screen bg-opacity-0 bg-cover bg-center bg-fixed transition-opacity duration-300 ease-in-out flex flex-col"
|
||||
class="h-full select-none font-sans min-h-screen bg-black/0 bg-cover bg-center bg-fixed transition-opacity duration-300 ease-in-out flex flex-col"
|
||||
>
|
||||
<header class="l-header">
|
||||
<div class="l-header__content">
|
||||
@@ -251,7 +264,7 @@
|
||||
<div class="bg-image"></div>
|
||||
<div
|
||||
id="turnstile-container"
|
||||
class="fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-[99999]"
|
||||
class="fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-99999"
|
||||
></div>
|
||||
<gutter-ads></gutter-ads>
|
||||
|
||||
@@ -265,7 +278,7 @@
|
||||
<territory-patterns-modal class="w-[20%] md:w-[15%]">
|
||||
<button
|
||||
id="territory-patterns-input-preview-button"
|
||||
class="w-full border p-[4px] rounded-lg flex cursor-pointer border-black/30 dark:border-gray-300/60 bg-white/70 dark:bg-[rgba(55,65,81,0.7)] justify-center"
|
||||
class="w-full border p-1 rounded-lg flex cursor-pointer border-black/30 dark:border-gray-300/60 bg-white/70 dark:bg-[rgba(55,65,81,0.7)] justify-center"
|
||||
title="Pick a pattern!"
|
||||
></button>
|
||||
</territory-patterns-modal>
|
||||
@@ -323,14 +336,10 @@
|
||||
<button
|
||||
id="settings-button"
|
||||
title="Settings"
|
||||
class="fixed bottom-4 right-4 z-50 rounded-full p-2 shadow-lg transition-colors duration-300 flex items-center justify-center"
|
||||
style="width: 60px; height: 60px; background-color: #0075ff"
|
||||
class="fixed bottom-4 right-4 z-50 rounded-full p-2 shadow-lg transition-colors duration-300 flex items-center justify-center size-15 bg-(--primaryColor)"
|
||||
style="--primaryColor: #0075ff"
|
||||
>
|
||||
<img
|
||||
src="/images/SettingIconWhite.svg"
|
||||
alt="Settings"
|
||||
style="width: 52px; height: 52px"
|
||||
/>
|
||||
<img src="/images/SettingIconWhite.svg" alt="Settings" class="size-18" />
|
||||
</button>
|
||||
|
||||
<!-- Game components -->
|
||||
@@ -339,22 +348,20 @@
|
||||
</div>
|
||||
<div id="app"></div>
|
||||
<div id="radialMenu" class="radial-menu"></div>
|
||||
<div class="flex gap-2 fixed right-[10px] top-[10px] z-50 flex-col">
|
||||
<div class="flex gap-2 fixed right-2.5 top-2.5 z-50 flex-col">
|
||||
<player-info-overlay></player-info-overlay>
|
||||
</div>
|
||||
<div
|
||||
class="fixed bottom-[30px] sm:bottom-auto sm:top-[20px] z-50 mx-auto max-w-max inset-x-0 items-center"
|
||||
class="fixed bottom-7.5 sm:bottom-auto sm:top-5 z-50 mx-auto max-w-max inset-x-0 items-center"
|
||||
>
|
||||
<heads-up-message></heads-up-message>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="left-0 bottom-0 sm:left-4 sm:bottom-4 w-full flex-col-reverse sm:flex-row z-50 md:w-[320px]"
|
||||
style="position: fixed; pointer-events: none"
|
||||
class="left-0 bottom-0 sm:left-4 sm:bottom-4 w-full flex-col-reverse sm:flex-row z-50 md:w-[320px] fixed pointer-events-none"
|
||||
>
|
||||
<div
|
||||
class="w-full md:w-2/3 md:fixed sm:right-0 md:bottom-0 md:flex flex-col items-end"
|
||||
style="pointer-events: none"
|
||||
class="w-full md:w-2/3 md:fixed sm:right-0 md:bottom-0 md:flex flex-col items-end pointer-events-none"
|
||||
>
|
||||
<chat-display></chat-display>
|
||||
<events-display></events-display>
|
||||
@@ -366,13 +373,13 @@
|
||||
|
||||
<!-- Footer section -->
|
||||
<footer
|
||||
class="flex justify-center px-3 py-3 md:px-6 md:py-3 bg-[var(--boxBackgroundColor)] backdrop-blur-sm"
|
||||
class="flex justify-center px-3 py-3 md:px-6 md:py-3 bg-(--boxBackgroundColor) backdrop-blur-xs"
|
||||
>
|
||||
<div
|
||||
class="flex flex-col md:flex-row flex-nowrap justify-between items-center gap-4 md:gap-0 w-full max-w-[860px] flex-1"
|
||||
class="flex flex-col md:flex-row flex-nowrap justify-between items-center gap-4 md:gap-0 w-full max-w-215 flex-1"
|
||||
>
|
||||
<div
|
||||
class="flex flex-col sm:flex-row gap-4 sm:gap-5 text-white/70 justify-center md:justify-start flex-shrink-0"
|
||||
class="flex flex-col sm:flex-row gap-4 sm:gap-5 text-white/70 justify-center md:justify-start shrink-0"
|
||||
>
|
||||
<a
|
||||
href="https://openfront.wiki/Main_Page"
|
||||
@@ -397,7 +404,7 @@
|
||||
<span data-i18n="main.join_discord"> Discord </span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="flex justify-center text-white/70 flex-shrink-0">
|
||||
<div class="flex justify-center text-white/70 shrink-0">
|
||||
<a
|
||||
href="https://github.com/openfrontio/OpenFrontIO"
|
||||
class="text-white/70 hover:text-white transition-colors duration-300 ease-in-out inline-flex items-center gap-2 whitespace-nowrap"
|
||||
@@ -414,7 +421,7 @@
|
||||
</a>
|
||||
</div>
|
||||
<div
|
||||
class="flex flex-col sm:flex-row gap-4 sm:gap-4 text-white/70 justify-center md:justify-end flex-shrink-0"
|
||||
class="flex flex-col sm:flex-row gap-4 sm:gap-4 text-white/70 justify-center md:justify-end shrink-0"
|
||||
>
|
||||
<a
|
||||
href="/privacy-policy.html"
|
||||
@@ -446,7 +453,7 @@
|
||||
<game-starting-modal></game-starting-modal>
|
||||
<game-top-bar></game-top-bar>
|
||||
<unit-display></unit-display>
|
||||
<div class="flex flex-col items-end fixed top-4 right-4 z-[1000] gap-2">
|
||||
<div class="flex flex-col items-end fixed top-4 right-4 z-1000 gap-2">
|
||||
<game-right-sidebar></game-right-sidebar>
|
||||
<replay-panel></replay-panel>
|
||||
</div>
|
||||
@@ -468,16 +475,16 @@
|
||||
<performance-overlay></performance-overlay>
|
||||
<div
|
||||
id="language-modal"
|
||||
class="fixed inset-0 bg-black bg-opacity-50 z-50 hidden flex justify-center items-center"
|
||||
class="fixed inset-0 bg-black/50 z-50 hidden flex justify-center items-center"
|
||||
>
|
||||
<div class="bg-white rounded-lg shadow-lg p-6 w-96 max-w-full">
|
||||
<h2 class="text-xl font-semibold mb-4">Select Language</h2>
|
||||
<div
|
||||
id="language-list"
|
||||
class="space-y-2 max-h-80 overflow-y-auto"
|
||||
class="flex flex-col gap-2 max-h-80 overflow-y-auto"
|
||||
></div>
|
||||
<button
|
||||
class="mt-4 w-full bg-blue-600 hover:bg-blue-700 text-white py-2 px-4 rounded"
|
||||
class="mt-4 w-full bg-blue-600 hover:bg-blue-700 text-white py-2 px-4 rounded-sm"
|
||||
onclick="
|
||||
document.getElementById('language-modal').classList.add('hidden')
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user