From cb78b6b3c3d9c16dbb86f9411b323f42e33e621c Mon Sep 17 00:00:00 2001
From: Dogma <103559271+ArtificialDogma@users.noreply.github.com>
Date: Fri, 10 Mar 2023 21:34:14 +1100
Subject: [PATCH 1/3] Added Action, ROE, formation and threat icons
---
.../public/themes/olympus/images/icons_actions_gas_dark.svg | 3 +++
.../public/themes/olympus/images/icons_actions_gas_light.svg | 3 +++
.../public/themes/olympus/images/icons_actions_rtb_dark.svg | 3 +++
.../public/themes/olympus/images/icons_actions_rtb_light.svg | 3 +++
.../themes/olympus/images/icons_actions_search_dark.svg | 3 +++
.../themes/olympus/images/icons_actions_search_light.svg | 3 +++
.../public/themes/olympus/images/icons_form_abreast_dark.svg | 5 +++++
.../themes/olympus/images/icons_form_abreast_light.svg | 5 +++++
.../public/themes/olympus/images/icons_form_admin_dark.svg | 4 ++++
.../public/themes/olympus/images/icons_form_admin_light.svg | 4 ++++
.../public/themes/olympus/images/icons_form_echelon_dark.svg | 4 ++++
.../themes/olympus/images/icons_form_echelon_light.svg | 4 ++++
.../public/themes/olympus/images/icons_form_trail_dark.svg | 4 ++++
.../public/themes/olympus/images/icons_form_trail_light.svg | 4 ++++
client/public/themes/olympus/images/icons_roe_free_dark.svg | 3 +++
client/public/themes/olympus/images/icons_roe_free_light.svg | 3 +++
.../public/themes/olympus/images/icons_roe_return_dark.svg | 3 +++
.../public/themes/olympus/images/icons_roe_return_light.svg | 3 +++
client/public/themes/olympus/images/icons_roe_stop_dark.svg | 3 +++
client/public/themes/olympus/images/icons_roe_stop_light.svg | 3 +++
.../public/themes/olympus/images/icons_roe_target_dark.svg | 3 +++
.../public/themes/olympus/images/icons_roe_target_light.svg | 3 +++
.../themes/olympus/images/icons_threat_protect_dark.svg | 3 +++
.../themes/olympus/images/icons_threat_protect_light.svg | 3 +++
.../themes/olympus/images/icons_threat_retreat_dark.svg | 3 +++
.../themes/olympus/images/icons_threat_retreat_light.svg | 3 +++
26 files changed, 88 insertions(+)
create mode 100644 client/public/themes/olympus/images/icons_actions_gas_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_actions_gas_light.svg
create mode 100644 client/public/themes/olympus/images/icons_actions_rtb_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_actions_rtb_light.svg
create mode 100644 client/public/themes/olympus/images/icons_actions_search_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_actions_search_light.svg
create mode 100644 client/public/themes/olympus/images/icons_form_abreast_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_form_abreast_light.svg
create mode 100644 client/public/themes/olympus/images/icons_form_admin_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_form_admin_light.svg
create mode 100644 client/public/themes/olympus/images/icons_form_echelon_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_form_echelon_light.svg
create mode 100644 client/public/themes/olympus/images/icons_form_trail_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_form_trail_light.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_free_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_free_light.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_return_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_return_light.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_stop_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_stop_light.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_target_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_roe_target_light.svg
create mode 100644 client/public/themes/olympus/images/icons_threat_protect_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_threat_protect_light.svg
create mode 100644 client/public/themes/olympus/images/icons_threat_retreat_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_threat_retreat_light.svg
diff --git a/client/public/themes/olympus/images/icons_actions_gas_dark.svg b/client/public/themes/olympus/images/icons_actions_gas_dark.svg
new file mode 100644
index 00000000..feee9f86
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_gas_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_actions_gas_light.svg b/client/public/themes/olympus/images/icons_actions_gas_light.svg
new file mode 100644
index 00000000..f9c9ebd0
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_gas_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_actions_rtb_dark.svg b/client/public/themes/olympus/images/icons_actions_rtb_dark.svg
new file mode 100644
index 00000000..c3682f22
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_rtb_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_actions_rtb_light.svg b/client/public/themes/olympus/images/icons_actions_rtb_light.svg
new file mode 100644
index 00000000..0c9231e3
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_rtb_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_actions_search_dark.svg b/client/public/themes/olympus/images/icons_actions_search_dark.svg
new file mode 100644
index 00000000..497481c1
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_search_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_actions_search_light.svg b/client/public/themes/olympus/images/icons_actions_search_light.svg
new file mode 100644
index 00000000..2ca59cbb
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_search_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_abreast_dark.svg b/client/public/themes/olympus/images/icons_form_abreast_dark.svg
new file mode 100644
index 00000000..c528c451
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_abreast_dark.svg
@@ -0,0 +1,5 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_abreast_light.svg b/client/public/themes/olympus/images/icons_form_abreast_light.svg
new file mode 100644
index 00000000..2408169f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_abreast_light.svg
@@ -0,0 +1,5 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_admin_dark.svg b/client/public/themes/olympus/images/icons_form_admin_dark.svg
new file mode 100644
index 00000000..49d375dd
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_admin_dark.svg
@@ -0,0 +1,4 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_admin_light.svg b/client/public/themes/olympus/images/icons_form_admin_light.svg
new file mode 100644
index 00000000..dbf4f074
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_admin_light.svg
@@ -0,0 +1,4 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_echelon_dark.svg b/client/public/themes/olympus/images/icons_form_echelon_dark.svg
new file mode 100644
index 00000000..25144e4f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_echelon_dark.svg
@@ -0,0 +1,4 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_echelon_light.svg b/client/public/themes/olympus/images/icons_form_echelon_light.svg
new file mode 100644
index 00000000..42215873
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_echelon_light.svg
@@ -0,0 +1,4 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_trail_dark.svg b/client/public/themes/olympus/images/icons_form_trail_dark.svg
new file mode 100644
index 00000000..0c9ff544
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_trail_dark.svg
@@ -0,0 +1,4 @@
+
diff --git a/client/public/themes/olympus/images/icons_form_trail_light.svg b/client/public/themes/olympus/images/icons_form_trail_light.svg
new file mode 100644
index 00000000..bf9fcfd3
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_trail_light.svg
@@ -0,0 +1,4 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_free_dark.svg b/client/public/themes/olympus/images/icons_roe_free_dark.svg
new file mode 100644
index 00000000..a3b0b02f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_free_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_free_light.svg b/client/public/themes/olympus/images/icons_roe_free_light.svg
new file mode 100644
index 00000000..1fdf5d13
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_free_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_return_dark.svg b/client/public/themes/olympus/images/icons_roe_return_dark.svg
new file mode 100644
index 00000000..e42485a7
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_return_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_return_light.svg b/client/public/themes/olympus/images/icons_roe_return_light.svg
new file mode 100644
index 00000000..030534d7
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_return_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_stop_dark.svg b/client/public/themes/olympus/images/icons_roe_stop_dark.svg
new file mode 100644
index 00000000..fcc0c75f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_stop_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_stop_light.svg b/client/public/themes/olympus/images/icons_roe_stop_light.svg
new file mode 100644
index 00000000..98b50cb4
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_stop_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_target_dark.svg b/client/public/themes/olympus/images/icons_roe_target_dark.svg
new file mode 100644
index 00000000..3a2f17db
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_target_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_roe_target_light.svg b/client/public/themes/olympus/images/icons_roe_target_light.svg
new file mode 100644
index 00000000..9f8031ff
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_target_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_threat_protect_dark.svg b/client/public/themes/olympus/images/icons_threat_protect_dark.svg
new file mode 100644
index 00000000..97c1deb0
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_protect_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_threat_protect_light.svg b/client/public/themes/olympus/images/icons_threat_protect_light.svg
new file mode 100644
index 00000000..a3ae6b88
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_protect_light.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_threat_retreat_dark.svg b/client/public/themes/olympus/images/icons_threat_retreat_dark.svg
new file mode 100644
index 00000000..cb31ee40
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_retreat_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_threat_retreat_light.svg b/client/public/themes/olympus/images/icons_threat_retreat_light.svg
new file mode 100644
index 00000000..e17d43f4
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_retreat_light.svg
@@ -0,0 +1,3 @@
+
From 69a476af2e0a79ddab80d4c2600eb6cf786db5ea Mon Sep 17 00:00:00 2001
From: Dogma <103559271+ArtificialDogma@users.noreply.github.com>
Date: Fri, 10 Mar 2023 21:36:04 +1100
Subject: [PATCH 2/3] Add files via upload
---
.../themes/olympus/images/icons_actions_nothing_dark.svg | 3 +++
.../themes/olympus/images/icons_actions_nothing_light.svg | 3 +++
2 files changed, 6 insertions(+)
create mode 100644 client/public/themes/olympus/images/icons_actions_nothing_dark.svg
create mode 100644 client/public/themes/olympus/images/icons_actions_nothing_light.svg
diff --git a/client/public/themes/olympus/images/icons_actions_nothing_dark.svg b/client/public/themes/olympus/images/icons_actions_nothing_dark.svg
new file mode 100644
index 00000000..f6bb0463
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_nothing_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/public/themes/olympus/images/icons_actions_nothing_light.svg b/client/public/themes/olympus/images/icons_actions_nothing_light.svg
new file mode 100644
index 00000000..1ea95812
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_nothing_light.svg
@@ -0,0 +1,3 @@
+
From cc4f0a28df3797265e643a1f4f139299bc5e29a7 Mon Sep 17 00:00:00 2001
From: PeekabooSteam
Date: Fri, 10 Mar 2023 10:36:36 +0000
Subject: [PATCH 3/3] Added sample content to loadout.
---
client/public/stylesheets/layout.css | 30 ++++++++++++++++++++++++---
client/public/stylesheets/olympus.css | 18 +++++++++++++---
client/public/stylesheets/units.css | 16 +++++++-------
client/views/unitcontrolpanel.ejs | 8 +++++--
4 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/client/public/stylesheets/layout.css b/client/public/stylesheets/layout.css
index b4b4ddbc..8de7e858 100644
--- a/client/public/stylesheets/layout.css
+++ b/client/public/stylesheets/layout.css
@@ -58,8 +58,32 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
display:block !important;
}
-.content #unit-control-panel {
- position: static;
+#unit-control-panel #loadout-container {
+ display:flex;
+ flex-wrap: wrap;
+ row-gap: 4px;
+}
+
+#unit-control-panel #loadout-label span {
+ display:block;
+ float:right;
+}
+
+#unit-control-panel #loadout-label span::before {
+ content: url( /images/icons/fuel.svg );
+ display:inline-block;
+ filter:invert(100%);
+ height:16px;
+ translate:-25% 5%;
+ width:16px;
+}
+
+#unit-control-panel #loadout-label span::after {
+ content: attr( data-fuel-level ) "%";
+}
+
+#unit-control-panel #loadout-container .loadout-item {
+ background-color: black;
}
dl.data-grid {
@@ -219,7 +243,7 @@ dl.data-grid dd.br-info[data-bearing][data-distance][data-distance-units]::after
}
#mouse-info-panel dt#ref-measure-position::after {
- background-image: url( "/images/unit.png" );
+ background-image: url( "/images/icons/ruler.svg" );
background-position: 50% 50%;
background-repeat: no-repeat;
background-size:16px 16px;
diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css
index 32b97909..49c95441 100644
--- a/client/public/stylesheets/olympus.css
+++ b/client/public/stylesheets/olympus.css
@@ -64,6 +64,7 @@ button[disabled="disabled"] {
.pill {
+ background-color: var( --background-darksteel );
border-radius: var(--border-radius-sm);
padding: 2px 6px;
width: fit-content;
@@ -71,6 +72,12 @@ button[disabled="disabled"] {
+.loadout-item::after {
+ content: attr( data-qty ) 'x ' attr( data-item );
+}
+
+
+
.ol-panel {
background-color: var(--background-steel);
border-radius: 15px;
@@ -194,7 +201,7 @@ button[disabled="disabled"] {
padding: 6px 2px;
text-align: left;
white-space: nowrap;
- width: fit-content;
+ width: 100%;
}
.ol-select>.ol-select-options>div button:hover {
@@ -655,5 +662,10 @@ body[data-hide-naval] #unit-visibility-control-naval {
transform: translateX(var(--height));
}
-[data-coalition=blue], [data-active-coalition=blue] {background-color: var(--primary-blue)}
-[data-coalition=red], [data-active-coalition=red] {background-color:var(--primary-red)}
\ No newline at end of file
+[data-active-coalition="blue"] {
+ background-color: var(--primary-blue)
+}
+
+[data-active-coalition="red"] {
+ background-color:var(--primary-red)
+}
\ No newline at end of file
diff --git a/client/public/stylesheets/units.css b/client/public/stylesheets/units.css
index 9d762ce6..2a743efb 100644
--- a/client/public/stylesheets/units.css
+++ b/client/public/stylesheets/units.css
@@ -24,14 +24,14 @@ div.unit:not( .no-function ) {
cursor:pointer;
}
-[data-hide-aircraft] div.unit-air,
-[data-hide-ground] div.unit-ground,
-[data-hide-sam] div.unit-sam,
-[data-hide-threat] div.unit-threat,
-[data-hide-naval] div.unit-naval,
-[data-hide-blue] div.unit[data-coalition="blue"],
-[data-hide-red] div.unit[data-coalition="red"],
-[data-hide-neutral] div.unit[data-coalition="neutral"] {
+[data-hide-aircraft] #map-container div.unit-air,
+[data-hide-ground] #map-container div.unit-ground,
+[data-hide-sam] #map-container div.unit-sam,
+[data-hide-threat] #map-container div.unit-threat,
+[data-hide-naval] #map-container div.unit-naval,
+[data-hide-blue] #map-container div.unit[data-coalition="blue"],
+[data-hide-red] #map-container div.unit[data-coalition="red"],
+[data-hide-neutral] #map-container div.unit[data-coalition="neutral"] {
display:none;
}
diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs
index 3a78af31..7f69c0e6 100644
--- a/client/views/unitcontrolpanel.ejs
+++ b/client/views/unitcontrolpanel.ejs
@@ -56,8 +56,12 @@