weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/units' into v0.1.0

Browse Source 
# Conflicts:
#	client/public/stylesheets/olympus.css
#	client/public/stylesheets/style.css
This commit is contained in:
dpassoni
2023-03-06 11:18:21 +01:00
parent 1a32d5ad17 39a56f53f8
commit 5fe125beff
35 changed files with 2053 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/views/index.ejs
View File

@@ -2,7 +2,8 @@
<head>
<title>Olympus client</title>
<link rel="stylesheet" href="stylesheets/olympus.css">
<link rel="stylesheet" type="text/css" href="./themes/olympus/olympus.css" />
<link rel="stylesheet" type="text/css" href="stylesheets/olympus.css" />
<link rel="stylesheet" href="stylesheets/leaflet.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>