From 32cb147a02ac7e7954b64f9a356d833d1339f2c3 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Mon, 22 May 2023 08:22:50 +0200 Subject: [PATCH] More restyling with svg images --- client/package-lock.json | 26 + client/package.json | 2 + client/public/images/pin.svg | 1 - .../public/images/reference-system-test.svg | 370 ----- client/public/images/reference-system.svg | 218 --- client/public/images/unit.png | Bin 22307 -> 0 bytes client/public/stylesheets/olympus.css | 161 +-- client/public/stylesheets/units.css | 351 +---- .../180.svg} | 0 .../cancel.svg} | 0 .../gas.svg} | 0 .../nothing.svg} | 0 .../rtb.svg} | 0 .../search.svg} | 0 .../{ => buttons/other}/spawn_aircraft.svg | 0 .../{ => buttons/other}/spawn_ground.svg | 0 .../{ => buttons/other}/spawn_smoke.svg | 0 .../olympus/images/buttons/roe/designated.svg | 44 + .../olympus/images/buttons/roe/free.svg | 43 + .../olympus/images/buttons/roe/hold.svg | 43 + .../olympus/images/buttons/roe/return.svg | 43 + .../olympus/images/buttons/threat/evade.svg | 61 + .../images/buttons/threat/manoeuvre.svg | 50 + .../olympus/images/buttons/threat/none.svg | 43 + .../olympus/images/buttons/threat/passive.svg | 64 + .../images/buttons/visibility/aircraft.svg | 5 + .../buttons/visibility/groundunit-other.svg | 13 + .../buttons/visibility/groundunit-sam.svg | 19 + .../images/buttons/visibility/navyunit.svg | 5 + .../images/buttons/visibility/threatring.svg | 5 + .../icons_form_abreast_dark.svg | 0 .../icons_form_abreast_light.svg | 0 .../icons_form_admin_dark.svg | 0 .../icons_form_admin_light.svg | 0 .../icons_form_echelon_dark.svg | 0 .../icons_form_echelon_light.svg | 0 .../icons_form_trail_dark.svg | 0 .../icons_form_trail_light.svg | 0 .../themes/olympus/images/icon_aa_blue.svg | 3 - .../olympus/images/icon_aa_blue_hover.svg | 4 - .../olympus/images/icon_aa_blue_selected.svg | 4 - .../themes/olympus/images/icon_aa_neutral.svg | 3 - .../olympus/images/icon_aa_neutral_hover.svg | 4 - .../images/icon_aa_neutral_selected.svg | 4 - .../themes/olympus/images/icon_aa_red.svg | 3 - .../olympus/images/icon_aa_red_hover.svg | 4 - .../olympus/images/icon_aa_red_selected.svg | 4 - .../olympus/images/icon_airbase_neutral.svg | 83 -- .../olympus/images/icon_airbase_red.svg | 83 -- .../olympus/images/icon_aircraft_blue.svg | 4 - .../images/icon_aircraft_blue_hover.svg | 4 - .../images/icon_aircraft_blue_selected.svg | 4 - .../olympus/images/icon_aircraft_neutral.svg | 4 - .../images/icon_aircraft_neutral_hover.svg | 4 - .../images/icon_aircraft_neutral_selected.svg | 4 - .../olympus/images/icon_aircraft_red.svg | 4 - .../images/icon_aircraft_red_hover.svg | 4 - .../images/icon_aircraft_red_selected.svg | 4 - .../themes/olympus/images/icon_bomb_blue.svg | 3 - .../olympus/images/icon_bomb_neutral.svg | 3 - .../themes/olympus/images/icon_bomb_red.svg | 3 - .../images/icon_building_blue_hover.svg | 5 - .../images/icon_building_blue_selected.svg | 5 - .../olympus/images/icon_building_neutral.svg | 4 - .../images/icon_building_neutral_hover.svg | 5 - .../images/icon_building_neutral_selected.svg | 5 - .../olympus/images/icon_building_red.svg | 4 - .../images/icon_building_red_hover.svg | 5 - .../images/icon_building_red_selected.svg | 5 - .../themes/olympus/images/icon_death_blue.svg | 3 - .../olympus/images/icon_death_neutral.svg | 3 - .../themes/olympus/images/icon_death_red.svg | 3 - .../olympus/images/icon_ground_blue_hover.svg | 5 - .../images/icon_ground_blue_selected.svg | 5 - .../olympus/images/icon_ground_neutral.svg | 4 - .../images/icon_ground_neutral_hover.svg | 5 - .../images/icon_ground_neutral_selected.svg | 5 - .../themes/olympus/images/icon_ground_red.svg | 4 - .../olympus/images/icon_ground_red_hover.svg | 5 - .../images/icon_ground_red_selected.svg | 5 - .../themes/olympus/images/icon_hold_blue.svg | 4 - .../themes/olympus/images/icon_hold_red.svg | 4 - .../olympus/images/icon_missile_neutral.svg | 5 - .../olympus/images/icon_missile_red.svg | 5 - .../olympus/images/icon_navyuni_blue.svg | 4 - .../olympus/images/icon_navyunit_neutral.svg | 4 - .../olympus/images/icon_navyunit_red.svg | 4 - .../themes/olympus/images/icon_rtb_blue.svg | 4 - .../olympus/images/icon_rtb_neutral.svg | 4 - .../themes/olympus/images/icon_sam_blue.svg | 3 - .../olympus/images/icon_sam_neutral.svg | 3 - .../themes/olympus/images/icon_sam_red.svg | 3 - .../themes/olympus/images/icon_ship_blue.svg | 4 - .../olympus/images/icon_ship_blue_hover.svg | 5 - .../images/icon_ship_blue_selected.svg | 5 - .../olympus/images/icon_ship_neutral.svg | 4 - .../images/icon_ship_neutral_hover.svg | 5 - .../images/icon_ship_neutral_selected.svg | 5 - .../themes/olympus/images/icon_ship_red.svg | 4 - .../olympus/images/icon_ship_red_hover.svg | 5 - .../olympus/images/icon_ship_red_selected.svg | 5 - .../olympus/images/icons_actions_180_dark.svg | 4 - .../images/icons_actions_cancel_dark.svg | 3 - .../olympus/images/icons_actions_gas_dark.svg | 3 - .../images/icons_actions_nothing_dark.svg | 3 - .../olympus/images/icons_actions_rtb_dark.svg | 3 - .../images/icons_actions_search_dark.svg | 3 - .../olympus/images/icons_roe_attack_dark.svg | 10 - .../olympus/images/icons_roe_attack_light.svg | 10 - .../olympus/images/icons_roe_defend_dark.svg | 3 - .../olympus/images/icons_roe_defend_light.svg | 3 - .../olympus/images/icons_roe_free_dark.svg | 3 - .../olympus/images/icons_roe_free_light.svg | 3 - .../olympus/images/icons_roe_return_dark.svg | 3 - .../olympus/images/icons_roe_return_light.svg | 3 - .../olympus/images/icons_roe_stop_dark.svg | 3 - .../olympus/images/icons_roe_stop_light.svg | 3 - .../olympus/images/icons_roe_target_dark.svg | 3 - .../olympus/images/icons_roe_target_light.svg | 3 - .../olympus/images/icons_threat_cms_dark.svg | 8 - .../olympus/images/icons_threat_cms_light.svg | 8 - .../images/icons_threat_defend_dark.svg | 7 - .../images/icons_threat_defend_light.svg | 7 - .../images/icons_threat_nothing_dark.svg | 3 - .../images/icons_threat_nothing_light.svg | 3 - .../images/icons_threat_protect_dark.svg | 3 - .../images/icons_threat_protect_light.svg | 3 - .../images/icons_threat_retreat_dark.svg | 3 - .../images/icons_threat_retreat_light.svg | 3 - .../airbase.svg} | 0 .../images/{ => other}/check_square.svg | 0 .../images/{ => other}/chevron-down.svg | 0 .../{ => other}/icons_misc_brush_blue.svg | 0 .../{ => other}/icons_misc_brush_dark.svg | 0 .../{ => other}/icons_misc_brush_light.svg | 0 .../{ => other}/icons_misc_gas_blue.svg | 0 .../{ => other}/icons_misc_gas_dark.svg | 0 .../{ => other}/icons_misc_gas_light.svg | 0 .../{ => other}/icons_misc_map_blue.svg | 0 .../{ => other}/icons_misc_map_dark.svg | 0 .../{ => other}/icons_misc_map_light.svg | 0 .../{ => other}/icons_misc_plane_blue.svg | 0 .../{ => other}/icons_misc_plane_dark.svg | 0 .../{ => other}/icons_misc_plane_light.svg | 0 .../{ => other}/icons_misc_settings_blue.svg | 0 .../{ => other}/icons_misc_settings_dark.svg | 0 .../{ => other}/icons_misc_settings_light.svg | 0 .../{ => other}/icons_misc_visible_blue.svg | 0 .../{ => other}/icons_misc_visible_dark.svg | 0 .../{ => other}/icons_misc_visible_light.svg | 0 .../olympus/images/{ => other}/map_source.svg | 0 .../themes/olympus/images/state_idle.svg | 4 - .../themes/olympus/images/state_rtb.svg | 4 - .../{state_attack.svg => states/attack.svg} | 0 .../images/{state_dcs.svg => states/dcs.svg} | 0 .../{state_follow.svg => states/follow.svg} | 0 .../{state_human.svg => states/human.svg} | 0 .../idle.svg} | 0 .../{state_refuel.svg => states/refuel.svg} | 0 .../{icon_rtb_red.svg => states/rtb.svg} | 0 .../themes/olympus/images/task_tanker.svg | 1256 ----------------- .../themes/olympus/images/units/aircraft.svg | 2 +- .../themes/olympus/images/units/bomb.svg | 3 + .../themes/olympus/images/units/death.svg | 3 + .../groundunit-other.svg} | 3 +- .../olympus/images/units/groundunit-sam.svg | 4 + .../missile.svg} | 2 +- .../themes/olympus/images/units/navyunit.svg | 5 + .../static.svg} | 3 +- .../images/visibility_aircraft_hidden.svg | 4 - .../images/visibility_aircraft_visible.svg | 5 - .../images/visibility_ground_hidden.svg | 12 - .../images/visibility_ground_visible.svg | 13 - .../images/visibility_navyunit_hidden.svg | 4 - .../images/visibility_navyunit_visible.svg | 5 - .../olympus/images/visibility_sam_hidden.svg | 18 - .../olympus/images/visibility_sam_visible.svg | 19 - .../images/visibility_threat_hidden.svg | 4 - .../images/visibility_threat_visible.svg | 5 - client/public/themes/olympus/theme.css | 133 +- client/routes/resources.js | 23 +- client/src/index.ts | 3 + client/src/map/map.ts | 1 + client/src/panels/unitcontrolpanel.ts | 11 +- client/src/units/unit.ts | 27 +- client/views/index.ejs | 2 + client/views/navbar.ejs | 48 +- client/views/uikit.ejs | 12 +- 188 files changed, 627 insertions(+), 3113 deletions(-) delete mode 100644 client/public/images/pin.svg delete mode 100644 client/public/images/reference-system-test.svg delete mode 100644 client/public/images/reference-system.svg delete mode 100644 client/public/images/unit.png rename client/public/themes/olympus/images/{icons_actions_180_light.svg => actions/180.svg} (100%) rename client/public/themes/olympus/images/{icons_actions_cancel_light.svg => actions/cancel.svg} (100%) rename client/public/themes/olympus/images/{icons_actions_gas_light.svg => actions/gas.svg} (100%) rename client/public/themes/olympus/images/{icons_actions_nothing_light.svg => actions/nothing.svg} (100%) rename client/public/themes/olympus/images/{icons_actions_rtb_light.svg => actions/rtb.svg} (100%) rename client/public/themes/olympus/images/{icons_actions_search_light.svg => actions/search.svg} (100%) rename client/public/themes/olympus/images/{ => buttons/other}/spawn_aircraft.svg (100%) rename client/public/themes/olympus/images/{ => buttons/other}/spawn_ground.svg (100%) rename client/public/themes/olympus/images/{ => buttons/other}/spawn_smoke.svg (100%) create mode 100644 client/public/themes/olympus/images/buttons/roe/designated.svg create mode 100644 client/public/themes/olympus/images/buttons/roe/free.svg create mode 100644 client/public/themes/olympus/images/buttons/roe/hold.svg create mode 100644 client/public/themes/olympus/images/buttons/roe/return.svg create mode 100644 client/public/themes/olympus/images/buttons/threat/evade.svg create mode 100644 client/public/themes/olympus/images/buttons/threat/manoeuvre.svg create mode 100644 client/public/themes/olympus/images/buttons/threat/none.svg create mode 100644 client/public/themes/olympus/images/buttons/threat/passive.svg create mode 100644 client/public/themes/olympus/images/buttons/visibility/aircraft.svg create mode 100644 client/public/themes/olympus/images/buttons/visibility/groundunit-other.svg create mode 100644 client/public/themes/olympus/images/buttons/visibility/groundunit-sam.svg create mode 100644 client/public/themes/olympus/images/buttons/visibility/navyunit.svg create mode 100644 client/public/themes/olympus/images/buttons/visibility/threatring.svg rename client/public/themes/olympus/images/{ => formations}/icons_form_abreast_dark.svg (100%) rename client/public/themes/olympus/images/{ => formations}/icons_form_abreast_light.svg (100%) rename client/public/themes/olympus/images/{ => formations}/icons_form_admin_dark.svg (100%) rename client/public/themes/olympus/images/{ => formations}/icons_form_admin_light.svg (100%) rename client/public/themes/olympus/images/{ => formations}/icons_form_echelon_dark.svg (100%) rename client/public/themes/olympus/images/{ => formations}/icons_form_echelon_light.svg (100%) rename client/public/themes/olympus/images/{ => formations}/icons_form_trail_dark.svg (100%) rename client/public/themes/olympus/images/{ => formations}/icons_form_trail_light.svg (100%) delete mode 100644 client/public/themes/olympus/images/icon_aa_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_blue_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_blue_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_neutral_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_neutral_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_red.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_red_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_aa_red_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_airbase_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_airbase_red.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_blue_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_blue_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_neutral_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_neutral_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_red.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_red_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_aircraft_red_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_bomb_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_bomb_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_bomb_red.svg delete mode 100644 client/public/themes/olympus/images/icon_building_blue_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_building_blue_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_building_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_building_neutral_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_building_neutral_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_building_red.svg delete mode 100644 client/public/themes/olympus/images/icon_building_red_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_building_red_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_death_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_death_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_death_red.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_blue_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_blue_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_neutral_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_neutral_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_red.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_red_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_ground_red_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_hold_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_hold_red.svg delete mode 100644 client/public/themes/olympus/images/icon_missile_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_missile_red.svg delete mode 100644 client/public/themes/olympus/images/icon_navyuni_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_navyunit_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_navyunit_red.svg delete mode 100644 client/public/themes/olympus/images/icon_rtb_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_rtb_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_sam_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_sam_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_sam_red.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_blue.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_blue_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_blue_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_neutral.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_neutral_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_neutral_selected.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_red.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_red_hover.svg delete mode 100644 client/public/themes/olympus/images/icon_ship_red_selected.svg delete mode 100644 client/public/themes/olympus/images/icons_actions_180_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_actions_cancel_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_actions_gas_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_actions_nothing_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_actions_rtb_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_actions_search_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_attack_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_attack_light.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_defend_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_defend_light.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_free_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_free_light.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_return_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_return_light.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_stop_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_stop_light.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_target_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_roe_target_light.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_cms_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_cms_light.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_defend_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_defend_light.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_nothing_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_nothing_light.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_protect_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_protect_light.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_retreat_dark.svg delete mode 100644 client/public/themes/olympus/images/icons_threat_retreat_light.svg rename client/public/themes/olympus/images/{icon_airbase_blue.svg => mission/airbase.svg} (100%) rename client/public/themes/olympus/images/{ => other}/check_square.svg (100%) rename client/public/themes/olympus/images/{ => other}/chevron-down.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_brush_blue.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_brush_dark.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_brush_light.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_gas_blue.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_gas_dark.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_gas_light.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_map_blue.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_map_dark.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_map_light.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_plane_blue.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_plane_dark.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_plane_light.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_settings_blue.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_settings_dark.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_settings_light.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_visible_blue.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_visible_dark.svg (100%) rename client/public/themes/olympus/images/{ => other}/icons_misc_visible_light.svg (100%) rename client/public/themes/olympus/images/{ => other}/map_source.svg (100%) delete mode 100644 client/public/themes/olympus/images/state_idle.svg delete mode 100644 client/public/themes/olympus/images/state_rtb.svg rename client/public/themes/olympus/images/{state_attack.svg => states/attack.svg} (100%) rename client/public/themes/olympus/images/{state_dcs.svg => states/dcs.svg} (100%) rename client/public/themes/olympus/images/{state_follow.svg => states/follow.svg} (100%) rename client/public/themes/olympus/images/{state_human.svg => states/human.svg} (100%) rename client/public/themes/olympus/images/{icon_hold_neutral.svg => states/idle.svg} (100%) rename client/public/themes/olympus/images/{state_refuel.svg => states/refuel.svg} (100%) rename client/public/themes/olympus/images/{icon_rtb_red.svg => states/rtb.svg} (100%) delete mode 100644 client/public/themes/olympus/images/task_tanker.svg create mode 100644 client/public/themes/olympus/images/units/bomb.svg create mode 100644 client/public/themes/olympus/images/units/death.svg rename client/public/themes/olympus/images/{icon_ground_blue.svg => units/groundunit-other.svg} (52%) create mode 100644 client/public/themes/olympus/images/units/groundunit-sam.svg rename client/public/themes/olympus/images/{icon_missile_blue.svg => units/missile.svg} (66%) create mode 100644 client/public/themes/olympus/images/units/navyunit.svg rename client/public/themes/olympus/images/{icon_building_blue.svg => units/static.svg} (58%) delete mode 100644 client/public/themes/olympus/images/visibility_aircraft_hidden.svg delete mode 100644 client/public/themes/olympus/images/visibility_aircraft_visible.svg delete mode 100644 client/public/themes/olympus/images/visibility_ground_hidden.svg delete mode 100644 client/public/themes/olympus/images/visibility_ground_visible.svg delete mode 100644 client/public/themes/olympus/images/visibility_navyunit_hidden.svg delete mode 100644 client/public/themes/olympus/images/visibility_navyunit_visible.svg delete mode 100644 client/public/themes/olympus/images/visibility_sam_hidden.svg delete mode 100644 client/public/themes/olympus/images/visibility_sam_visible.svg delete mode 100644 client/public/themes/olympus/images/visibility_threat_hidden.svg delete mode 100644 client/public/themes/olympus/images/visibility_threat_visible.svg diff --git a/client/package-lock.json b/client/package-lock.json index 55970983..b4457d1c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -24,12 +24,14 @@ }, "devDependencies": { "@babel/preset-env": "^7.21.4", + "@iconfu/svg-inject": "^1.2.3", "@types/gtag.js": "^0.0.12", "@types/node": "^18.16.1", "@types/sortablejs": "^1.15.0", "babelify": "^10.0.0", "browserify": "^17.0.0", "concurrently": "^7.6.0", + "cp": "^0.2.0", "esmify": "^2.1.1", "express-basic-auth": "^1.2.1", "nodemon": "^2.0.20", @@ -1769,6 +1771,12 @@ "node": ">=6.9.0" } }, + "node_modules/@iconfu/svg-inject": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@iconfu/svg-inject/-/svg-inject-1.2.3.tgz", + "integrity": "sha512-3v1MUAJqmJS4jmhHoCkSxt+EdJrjPHlLXrWocCT25kCxnxJto8028Z6CC406EL11KA53SDZgI/QQA5GEJAoiRw==", + "dev": true + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -2881,6 +2889,12 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "node_modules/cp": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/cp/-/cp-0.2.0.tgz", + "integrity": "sha512-4ftCvShHjIZG/zzomHyunNpBof3sOFTTmU6s6q9DdqAL/ANqrKV3pr6Z6kVfBI4hjn59DFLImrBqn7GuuMqSZA==", + "dev": true + }, "node_modules/create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -6893,6 +6907,12 @@ "to-fast-properties": "^2.0.0" } }, + "@iconfu/svg-inject": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@iconfu/svg-inject/-/svg-inject-1.2.3.tgz", + "integrity": "sha512-3v1MUAJqmJS4jmhHoCkSxt+EdJrjPHlLXrWocCT25kCxnxJto8028Z6CC406EL11KA53SDZgI/QQA5GEJAoiRw==", + "dev": true + }, "@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -7798,6 +7818,12 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "cp": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/cp/-/cp-0.2.0.tgz", + "integrity": "sha512-4ftCvShHjIZG/zzomHyunNpBof3sOFTTmU6s6q9DdqAL/ANqrKV3pr6Z6kVfBI4hjn59DFLImrBqn7GuuMqSZA==", + "dev": true + }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", diff --git a/client/package.json b/client/package.json index fce35cdf..f9cb7d2a 100644 --- a/client/package.json +++ b/client/package.json @@ -26,12 +26,14 @@ }, "devDependencies": { "@babel/preset-env": "^7.21.4", + "@iconfu/svg-inject": "^1.2.3", "@types/gtag.js": "^0.0.12", "@types/node": "^18.16.1", "@types/sortablejs": "^1.15.0", "babelify": "^10.0.0", "browserify": "^17.0.0", "concurrently": "^7.6.0", + "cp": "^0.2.0", "esmify": "^2.1.1", "express-basic-auth": "^1.2.1", "nodemon": "^2.0.20", diff --git a/client/public/images/pin.svg b/client/public/images/pin.svg deleted file mode 100644 index 19e92ec2..00000000 --- a/client/public/images/pin.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/public/images/reference-system-test.svg b/client/public/images/reference-system-test.svg deleted file mode 100644 index ff6f152a..00000000 --- a/client/public/images/reference-system-test.svg +++ /dev/null @@ -1,370 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - diff --git a/client/public/images/reference-system.svg b/client/public/images/reference-system.svg deleted file mode 100644 index cd71d782..00000000 --- a/client/public/images/reference-system.svg +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/client/public/images/unit.png b/client/public/images/unit.png deleted file mode 100644 index ae72bc19198e8cd98442381e7463d1d3a2504822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22307 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 :last-child { border: none; height: 32px; width: 32px; + padding: 0px; } -#unit-visibility-control-aircraft { - background-image: var(--visibility-control-aircraft-visible-url); +#unit-visibility-control button svg { + pointer-events: none; } -body[data-hide-aircraft] #unit-visibility-control-aircraft { - background-image: var(--visibility-control-aircraft-hidden-url); +#unit-visibility-control button svg .background { + fill: white; } -#unit-visibility-control-groundunit { - background-image: var(--visibility-control-groundunit-visible-url); +#unit-visibility-control button.off svg .foreground { + fill: var(--background-steel); } -body[data-hide-groundunit] #unit-visibility-control-groundunit { - background-image: var(--visibility-control-groundunit-hidden-url); +#unit-visibility-control button.off svg .background { + fill: none; } -#unit-visibility-control-sam { - background-image: var(--visibility-control-sam-visible-url); -} - -body[data-hide-sam] #unit-visibility-control-sam { - background-image: var(--visibility-control-sam-hidden-url); -} - -#unit-visibility-control-threat { - background-image: var(--visibility-control-threat-visible-url); -} - -body[data-hide-threat] #unit-visibility-control-threat { - background-image: var(--visibility-control-threat-hidden-url); -} - -#unit-visibility-control-navyunit { - background-image: var(--visibility-control-navyunit-visible-url); -} - -body[data-hide-navyunit] #unit-visibility-control-navyunit { - background-image: var(--visibility-control-navyunit-hidden-url); +#unit-visibility-control button.off svg .foreground { + fill: white; } #atc-navbar-control { @@ -642,9 +623,16 @@ body[data-hide-navyunit] #unit-visibility-control-navyunit { padding: 4px; } -#roe-buttons-container button { +#roe-buttons-container button, +#reaction-to-threat-buttons-container button, +#emissions-countermeasures-buttons-container button { + display: flex; background-color: transparent; border: 1px solid var(--accent-light-blue); + height: 30px; + width: 30px; + align-items: center; + justify-content: center; } #roe-buttons-container button.selected, @@ -654,113 +642,10 @@ body[data-hide-navyunit] #unit-visibility-control-navyunit { border-color: white; } -#roe-buttons-container button::before, -#reaction-to-threat-buttons-container button::before, -#emissions-countermeasures-buttons-container button::before { - background-position: center; - background-repeat: no-repeat; - content: ""; - display: block; - height: 24px; - width: 24px; -} - -#roe-buttons-container button[value="Hold"]::before { - background-image: url("/themes/olympus/images/icons_roe_stop_light.svg"); -} - -#roe-buttons-container button[value="Hold"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_stop_dark.svg"); -} - -/**/ -#roe-buttons-container button[value="Return"]::before { - background-image: url("/themes/olympus/images/icons_roe_defend_light.svg"); -} - -#roe-buttons-container button[value="Return"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_defend_dark.svg"); -} - -/**/ -#roe-buttons-container button[value="Designated"]::before { - background-image: url("/themes/olympus/images/icons_roe_target_light.svg"); -} - -#roe-buttons-container button[value="Designated"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_target_dark.svg"); -} - -/**/ -#roe-buttons-container button[value="Free"]::before { - background-image: url("/themes/olympus/images/icons_roe_free_light.svg"); -} - -#roe-buttons-container button[value="Free"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_free_dark.svg"); -} - -/****************************************************************************************/ -#reaction-to-threat-buttons-container button[value="None"]::before { - background-image: url("/themes/olympus/images/icons_threat_nothing_light.svg"); -} - -#reaction-to-threat-buttons-container button[value="None"].selected::before { - background-image: url("/themes/olympus/images/icons_threat_nothing_dark.svg"); -} - -/**/ -#reaction-to-threat-buttons-container button[value="Passive"]::before { - background-image: url("/themes/olympus/images/icons_threat_cms_light.svg"); -} - -#reaction-to-threat-buttons-container button[value="Passive"].selected::before { - background-image: url("/themes/olympus/images/icons_threat_cms_dark.svg"); -} - -/**/ -#reaction-to-threat-buttons-container button[value="Evade"]::before { - background-image: url("/themes/olympus/images/icons_threat_defend_light.svg"); -} - -#reaction-to-threat-buttons-container button[value="Evade"].selected::before { - background-image: url("/themes/olympus/images/icons_threat_defend_dark.svg"); -} - -/****************************************************************************************/ -#emissions-countermeasures-buttons-container button[value="Silent"]::before { - background-image: url("/themes/olympus/images/icons_roe_stop_light.svg"); -} - -#emissions-countermeasures-buttons-container button[value="Silent"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_stop_dark.svg"); -} - -/**/ -#emissions-countermeasures-buttons-container button[value="Defend"]::before { - background-image: url("/themes/olympus/images/icons_roe_defend_light.svg"); -} - -#emissions-countermeasures-buttons-container button[value="Defend"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_defend_dark.svg"); -} - -/**/ -#emissions-countermeasures-buttons-container button[value="Attack"]::before { - background-image: url("/themes/olympus/images/icons_roe_target_light.svg"); -} - -#emissions-countermeasures-buttons-container button[value="Attack"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_target_dark.svg"); -} - -/**/ -#emissions-countermeasures-buttons-container button[value="Free"]::before { - background-image: url("/themes/olympus/images/icons_roe_free_light.svg"); -} - -#emissions-countermeasures-buttons-container button[value="Free"].selected::before { - background-image: url("/themes/olympus/images/icons_roe_free_dark.svg"); +#roe-buttons-container button.selected svg .foreground, +#reaction-to-threat-buttons-container button.selected svg .foreground, +#emissions-countermeasures-buttons-container button.selected svg .foreground { + fill: var(--background-steel); } /****************************************************************************************/ diff --git a/client/public/stylesheets/units.css b/client/public/stylesheets/units.css index 4bdb7666..a523f47c 100644 --- a/client/public/stylesheets/units.css +++ b/client/public/stylesheets/units.css @@ -2,17 +2,9 @@ /* Generic marker settings */ --unit-centre-x: calc(var(--unit-width) / 2); --unit-centre-y: calc(var(--unit-height) / 2); - - --unit-hotgroup-height: 15px; - --unit-hotgroup-width: var(--unit-hotgroup-height); - - - /* Air units' marker settings */ - --unit-aircraft-label-x: calc(var(--unit-centre-x) - (var(--unit-aircraft-width) / 2) + (var(--unit-stroke-width) / 2)); - --unit-aircraft-label-y: calc(var(--unit-centre-y) - (var(--unit-aircraft-height) / 2) + (var(--unit-stroke-width) / 2)); } - +/*** Unit marker elements ***/ [data-object|="unit"] { align-items: center; cursor: pointer; @@ -23,15 +15,6 @@ width: 100%; } -.unit-selected-spotlight { - background-color: var(--unit-spotlight-fill); - border-radius: 50%; - display: none; - padding: var(--unit-spotlight-radius); - position: absolute; - z-index: 1; -} - .unit-vvi { align-self: center; background: var(--secondary-gunmetal-grey); @@ -42,16 +25,6 @@ padding-bottom: calc((var(--unit-aircraft-width) / 2) + var(--unit-stroke-width)); position: absolute; width: var(--unit-aircraft-vvi-width); - z-index: 3; -} - -.unit-marker-border { - border-radius: var(--border-radius-sm); - display: none; - height: calc(var(--unit-aircraft-height) + (var(--unit-label-border-width) * 2)); - position: absolute; - width: calc(var(--unit-aircraft-width) + (var(--unit-label-border-width) * 2)); - z-index: 2; } .unit-hotgroup { @@ -59,13 +32,12 @@ background-color: var(--background-steel); border-radius: var(--border-radius-xs); display: none; - height: var(--unit-hotgroup-height); + height: 15px; justify-content: center; position: absolute; transform: rotate(-45deg); translate: 0 -200%; - width: var(--unit-hotgroup-width); - z-index: 5; + width: 15px; } .unit-hotgroup-id { @@ -77,258 +49,61 @@ translate: -1px 1px; } - -/****************************** - Marker -******************************/ .unit-marker { position: absolute; transform-origin: center; - z-index: 3; height: var(--unit-height); width: var(--unit-width); } -[data-is-highlighted] .unit-marker { - stroke: white; +[data-is-selected] .unit-marker::before { + content: ""; + height: 100%; + width: 100%; + background-color: var(--unit-spotlight-fill); + border-radius: 50%; + position: absolute; + z-index: -1; } -[data-is-selected] .unit-marker { +/*** Basic colours ***/ +[data-coalition="blue"] .unit-marker>svg>.background { + fill: var(--primary-blue); } -[data-coalition="blue"] .unit-marker { +[data-coalition="red"] .unit-marker>svg>.background { + fill: var(--primary-red); } -[data-coalition="red"] .unit-marker { +[data-coalition="neutral"] .unit-marker>svg>.background { + fill: var(--primary-neutral); } -[data-coalition="neutral"] .unit-marker { - +[data-is-selected] .unit-marker>svg>.background { + fill: white; } -/* Aircraft */ -[data-object|="unit-aircraft"] .unit-marker { - +[data-is-highlighted] .unit-marker>svg>.background { + stroke: white; } -/* Ground vehicles (not SAMs) */ - -[data-object|="unit-groundunit"] .unit-marker { - background-image: var(--unit-groundunit-marker-neutral-url); - height: var(--unit-groundunit-marker-height); - width: var(--unit-groundunit-marker-width); -} - -[data-object|="unit-groundunit"][data-is-highlighted] .unit-marker { - background-image: var(--unit-groundunit-marker-neutral-hover-url); -} - -[data-object|="unit-groundunit"][data-is-selected] .unit-marker { - background-image: var(--unit-groundunit-marker-neutral-selected-url); -} - - -[data-object|="unit-groundunit"][data-coalition="blue"] .unit-marker { - background-image: var(--unit-groundunit-marker-blue-url); -} - -[data-object|="unit-groundunit"][data-coalition="blue"][data-is-highlighted] .unit-marker { - background-image: var(--unit-groundunit-marker-blue-hover-url); -} - -[data-object|="unit-groundunit"][data-coalition="blue"][data-is-selected] .unit-marker { - background-image: var(--unit-groundunit-marker-blue-selected-url); -} - - -[data-object|="unit-groundunit"][data-coalition="red"] .unit-marker { - background-image: var(--unit-groundunit-marker-red-url); -} - -[data-object|="unit-groundunit"][data-coalition="red"][data-is-highlighted] .unit-marker { - background-image: var(--unit-groundunit-marker-red-hover-url); -} - -[data-object|="unit-groundunit"][data-coalition="red"][data-is-selected] .unit-marker { - background-image: var(--unit-groundunit-marker-red-selected-url); -} - - -/* SAMs */ - -[data-object|="unit-sam"] .unit-selected-spotlight { - translate: 0 2px; -} - -[data-object|="unit-sam"] .unit-marker { - background-image: var(--unit-sam-marker-neutral-url); - height: var(--unit-sam-marker-height); - width: var(--unit-sam-marker-width); -} - - -[data-object|="unit-sam"][data-is-highlighted] .unit-marker { - background-image: var(--unit-sam-marker-neutral-hover-url); -} - -[data-object|="unit-sam"][data-is-selected] .unit-marker { - background-image: var(--unit-sam-marker-neutral-selected-url); -} - - -[data-object|="unit-sam"][data-coalition="blue"] .unit-marker { - background-image: var(--unit-sam-marker-blue-url); -} - -[data-object|="unit-sam"][data-coalition="blue"][data-is-highlighted] .unit-marker { - background-image: var(--unit-sam-marker-blue-hover-url); -} - -[data-object|="unit-sam"][data-coalition="blue"][data-is-selected] .unit-marker { - background-image: var(--unit-sam-marker-blue-selected-url); -} - - -[data-object|="unit-sam"][data-coalition="red"] .unit-marker { - background-image: var(--unit-sam-marker-red-url); -} - -[data-object|="unit-sam"][data-coalition="red"][data-is-highlighted] .unit-marker { - background-image: var(--unit-sam-marker-red-hover-url); -} - -[data-object|="unit-sam"][data-coalition="red"][data-is-selected] .unit-marker { - background-image: var(--unit-sam-marker-red-selected-url); -} - - -/* navyunit */ - -[data-object|="unit-navyunit"] .unit-selected-spotlight { - translate: 0 -2px; -} - -[data-object|="unit-navyunit"] .unit-marker { - background-image: var(--unit-navyunit-marker-neutral-url); - height: var(--unit-navyunit-marker-height); - width: var(--unit-navyunit-marker-width); -} - - -[data-object|="unit-navyunit"][data-is-highlighted] .unit-marker { - background-image: var(--unit-navyunit-marker-neutral-hover-url); -} - -[data-object|="unit-navyunit"][data-is-selected] .unit-marker { - background-image: var(--unit-navyunit-marker-neutral-selected-url); -} - - -[data-object|="unit-navyunit"][data-coalition="blue"] .unit-marker { - background-image: var(--unit-navyunit-marker-blue-url); -} - -[data-object|="unit-navyunit"][data-coalition="blue"][data-is-highlighted] .unit-marker { - background-image: var(--unit-navyunit-marker-blue-hover-url); -} - -[data-object|="unit-navyunit"][data-coalition="blue"][data-is-selected] .unit-marker { - background-image: var(--unit-navyunit-marker-blue-selected-url); -} - - -[data-object|="unit-navyunit"][data-coalition="red"] .unit-marker { - background-image: var(--unit-navyunit-marker-red-url); -} - -[data-object|="unit-navyunit"][data-coalition="red"][data-is-highlighted] .unit-marker { - background-image: var(--unit-navyunit-marker-red-hover-url); -} - -[data-object|="unit-navyunit"][data-coalition="red"][data-is-selected] .unit-marker { - background-image: var(--unit-navyunit-marker-red-selected-url); -} - - -/* Building */ -[data-object|="unit-building"] .unit-marker { - background-image: var(--unit-building-marker-neutral-url); - height: var(--unit-building-marker-height); - width: var(--unit-building-marker-width); -} - - -[data-object|="unit-building"][data-coalition="blue"] .unit-marker { - background-image: var(--unit-building-marker-blue-url); -} - - -[data-object|="unit-building"][data-coalition="red"] .unit-marker { - background-image: var(--unit-building-marker-red-url); -} - -/* Weapons */ - +/*** Cursors ***/ +[data-is-dead], [data-object|="unit-missile"], [data-object|="unit-bomb"] { cursor: default; } -[data-object|="unit-missile"] .unit-marker { - background-image: var(--unit-missile-marker-neutral-url); - height: var(--unit-missile-marker-height); - width: var(--unit-missile-marker-width); -} - -[data-object|="unit-missile"][data-coalition="blue"] .unit-marker { - background-image: var(--unit-missile-marker-blue-url); -} - -[data-object|="unit-missile"][data-coalition="red"] .unit-marker { - background-image: var(--unit-missile-marker-red-url); -} - -[data-object|="unit-bomb"] .unit-marker { - background-image: var(--unit-bomb-marker-neutral-url); - height: var(--unit-bomb-marker-height); - width: var(--unit-bomb-marker-width); -} - -[data-object|="unit-bomb"][data-coalition="blue"] .unit-marker { - background-image: var(--unit-bomb-marker-blue-url); -} - -[data-object|="unit-bomb"][data-coalition="red"] .unit-marker { - background-image: var(--unit-bomb-marker-red-url); -} - - -/******************************************** -* Labels -********************************************/ - +/*** Labels ***/ [data-object|="unit"] .unit-short-label { color: var(--secondary-gunmetal-grey); font-size: var(--unit-font-size); font-weight: var(--unit-font-weight); line-height: normal; position: absolute; - z-index: 10; } -[data-object|="unit-groundunit"] .unit-short-label { - translate: -1px 0; -} - -[data-object|="unit-sam"] .unit-short-label { - translate: 0 25%; -} - -[data-object|="unit-navyunit"] .unit-short-label { - translate: 0 -50%; -} - - +/*** Fuel indicator ***/ [data-object|="unit"] .unit-fuel { background: white; border: var(--unit-aircraft-fuel-border-width) solid var(--secondary-dark-steel); @@ -338,7 +113,6 @@ position: absolute; translate: var(--unit-aircraft-fuel-x) var(--unit-aircraft-fuel-y); width: var(--unit-aircraft-fuel-width); - z-index: 5; } [data-object|="unit"] .unit-fuel-level { @@ -347,7 +121,7 @@ width: 100%; } - +/*** Ammo indicator ***/ [data-object|="unit"] .unit-ammo { column-gap: var(--unit-aircraft-ammo-spacing); display: none; @@ -364,6 +138,7 @@ padding: var(--unit-aircraft-ammo-radius); } +/*** Unit summary ***/ [data-object|="unit"] .unit-summary { pointer-events: none; column-gap: 6px; @@ -383,7 +158,6 @@ 1px 1px 0 #000; translate: -60px 0; width: fit-content; - z-index: 20; } [data-hide-labels] [data-object|="unit"] .unit-summary { @@ -408,11 +182,22 @@ overflow: visible; } +/*** Common ***/ [data-object|="unit"]:hover .unit-ammo, [data-object|="unit"]:hover .unit-fuel { display: flex; } +@keyframes pulse { + 50% { + opacity: 0; + } +} + +[data-object|="unit"][data-has-low-fuel] .unit-fuel { + animation: pulse 1.5s linear infinite; +} + [data-object|="unit"][data-is-in-hotgroup] .unit-hotgroup, [data-object|="unit"][data-is-selected] .unit-ammo, [data-object|="unit"][data-is-selected] .unit-fuel, @@ -443,7 +228,6 @@ background-color: var(--secondary-blue-outline); } - [data-object|="unit"][data-coalition="red"][data-is-selected] .unit-short-label { color: var(--secondary-red-text); } @@ -460,76 +244,47 @@ background-color: var(--secondary-red-outline); } -@keyframes pulse { - 50% { - opacity: 0; - } -} - -[data-object|="unit"][data-has-low-fuel] .unit-fuel { - animation: pulse 1.5s linear infinite; -} - +/*** Unit state ***/ [data-object|="unit"] .unit-state { background-repeat: no-repeat; position: absolute; - height: var(--unit-aircraft-state-height); - width: var(--unit-aircraft-state-width); - z-index: 10; + height: 20px; + width: 20px; } [data-object|="unit"][data-state="rtb"] .unit-state { - background-image: var(--unit-aircraft-state-rtb); + background-image: url("/theme/images/states/rtb.svg"); } [data-object|="unit"][data-state="land"] .unit-state { - background-image: var(--unit-aircraft-state-rtb); + background-image: url("/theme/images/states/rtb.svg"); } [data-object|="unit"][data-state="idle"] .unit-state { - background-image: var(--unit-aircraft-state-idle); + background-image: url("/theme/images/states/idle.svg"); } [data-object|="unit"][data-state="attack"] .unit-state { - background-image: var(--unit-aircraft-state-attack); + background-image: url("/theme/images/states/attack.svg"); } [data-object|="unit"][data-state="follow"] .unit-state { - background-image: var(--unit-aircraft-state-follow); + background-image: url("/theme/images/states/follow.svg"); } [data-object|="unit"][data-state="refuel"] .unit-state { - background-image: var(--unit-aircraft-state-refuel); + background-image: url("/theme/images/states/refuel.svg"); } [data-object|="unit"][data-state="human"] .unit-state { - background-image: var(--unit-aircraft-state-human); + background-image: url("/theme/images/states/human.svg"); } [data-object|="unit"][data-state="dcs"] .unit-state { - background-image: var(--unit-aircraft-state-dcs); + background-image: url("/theme/images/states/dcs.svg"); } -/*** DEAD ***/ -[data-object|="unit-aircraft"][ data-is-dead] { - cursor: default; -} - -[data-object|="unit-aircraft"][ data-is-dead] .unit-marker { - background-image: var(--unit-aircraft-marker-neutral-dead-url); - background-position: 50% 50%; - background-size: auto 32px; -} - -[data-object|="unit-aircraft"][ data-is-dead][data-coalition="blue"] .unit-marker { - background-image: var(--unit-aircraft-marker-blue-dead-url); -} - -[data-object|="unit-aircraft"][ data-is-dead][data-coalition="red"] .unit-marker { - background-image: var(--unit-aircraft-marker-red-dead-url); -} - - +/*** Dead unit ***/ [data-object|="unit-aircraft"][data-is-dead] .unit-selected-spotlight, [data-object|="unit-aircraft"][data-is-dead] .unit-short-label, [data-object|="unit-aircraft"][data-is-dead] .unit-vvi, @@ -543,10 +298,10 @@ display: none; } -[data-object|="unit-aircraft"][ data-is-dead] .unit-summary>* { +[data-object|="unit-aircraft"][data-is-dead] .unit-summary>* { display: none; } -[data-object|="unit-aircraft"][ data-is-dead] .unit-summary .unit-callsign { +[data-object|="unit-aircraft"][data-is-dead] .unit-summary .unit-callsign { display: block; } \ No newline at end of file diff --git a/client/public/themes/olympus/images/icons_actions_180_light.svg b/client/public/themes/olympus/images/actions/180.svg similarity index 100% rename from client/public/themes/olympus/images/icons_actions_180_light.svg rename to client/public/themes/olympus/images/actions/180.svg diff --git a/client/public/themes/olympus/images/icons_actions_cancel_light.svg b/client/public/themes/olympus/images/actions/cancel.svg similarity index 100% rename from client/public/themes/olympus/images/icons_actions_cancel_light.svg rename to client/public/themes/olympus/images/actions/cancel.svg diff --git a/client/public/themes/olympus/images/icons_actions_gas_light.svg b/client/public/themes/olympus/images/actions/gas.svg similarity index 100% rename from client/public/themes/olympus/images/icons_actions_gas_light.svg rename to client/public/themes/olympus/images/actions/gas.svg diff --git a/client/public/themes/olympus/images/icons_actions_nothing_light.svg b/client/public/themes/olympus/images/actions/nothing.svg similarity index 100% rename from client/public/themes/olympus/images/icons_actions_nothing_light.svg rename to client/public/themes/olympus/images/actions/nothing.svg diff --git a/client/public/themes/olympus/images/icons_actions_rtb_light.svg b/client/public/themes/olympus/images/actions/rtb.svg similarity index 100% rename from client/public/themes/olympus/images/icons_actions_rtb_light.svg rename to client/public/themes/olympus/images/actions/rtb.svg diff --git a/client/public/themes/olympus/images/icons_actions_search_light.svg b/client/public/themes/olympus/images/actions/search.svg similarity index 100% rename from client/public/themes/olympus/images/icons_actions_search_light.svg rename to client/public/themes/olympus/images/actions/search.svg diff --git a/client/public/themes/olympus/images/spawn_aircraft.svg b/client/public/themes/olympus/images/buttons/other/spawn_aircraft.svg similarity index 100% rename from client/public/themes/olympus/images/spawn_aircraft.svg rename to client/public/themes/olympus/images/buttons/other/spawn_aircraft.svg diff --git a/client/public/themes/olympus/images/spawn_ground.svg b/client/public/themes/olympus/images/buttons/other/spawn_ground.svg similarity index 100% rename from client/public/themes/olympus/images/spawn_ground.svg rename to client/public/themes/olympus/images/buttons/other/spawn_ground.svg diff --git a/client/public/themes/olympus/images/spawn_smoke.svg b/client/public/themes/olympus/images/buttons/other/spawn_smoke.svg similarity index 100% rename from client/public/themes/olympus/images/spawn_smoke.svg rename to client/public/themes/olympus/images/buttons/other/spawn_smoke.svg diff --git a/client/public/themes/olympus/images/buttons/roe/designated.svg b/client/public/themes/olympus/images/buttons/roe/designated.svg new file mode 100644 index 00000000..8815698c --- /dev/null +++ b/client/public/themes/olympus/images/buttons/roe/designated.svg @@ -0,0 +1,44 @@ + + + + + + diff --git a/client/public/themes/olympus/images/buttons/roe/free.svg b/client/public/themes/olympus/images/buttons/roe/free.svg new file mode 100644 index 00000000..ea72b826 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/roe/free.svg @@ -0,0 +1,43 @@ + + + + + + diff --git a/client/public/themes/olympus/images/buttons/roe/hold.svg b/client/public/themes/olympus/images/buttons/roe/hold.svg new file mode 100644 index 00000000..3e2cbd79 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/roe/hold.svg @@ -0,0 +1,43 @@ + + + + + + diff --git a/client/public/themes/olympus/images/buttons/roe/return.svg b/client/public/themes/olympus/images/buttons/roe/return.svg new file mode 100644 index 00000000..4d64a998 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/roe/return.svg @@ -0,0 +1,43 @@ + + + + + + diff --git a/client/public/themes/olympus/images/buttons/threat/evade.svg b/client/public/themes/olympus/images/buttons/threat/evade.svg new file mode 100644 index 00000000..c5691783 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/threat/evade.svg @@ -0,0 +1,61 @@ + + + + + + + + + + diff --git a/client/public/themes/olympus/images/buttons/threat/manoeuvre.svg b/client/public/themes/olympus/images/buttons/threat/manoeuvre.svg new file mode 100644 index 00000000..de72b10b --- /dev/null +++ b/client/public/themes/olympus/images/buttons/threat/manoeuvre.svg @@ -0,0 +1,50 @@ + + + + + + + diff --git a/client/public/themes/olympus/images/buttons/threat/none.svg b/client/public/themes/olympus/images/buttons/threat/none.svg new file mode 100644 index 00000000..6663b0e5 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/threat/none.svg @@ -0,0 +1,43 @@ + + + + + + diff --git a/client/public/themes/olympus/images/buttons/threat/passive.svg b/client/public/themes/olympus/images/buttons/threat/passive.svg new file mode 100644 index 00000000..f0d3b893 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/threat/passive.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + diff --git a/client/public/themes/olympus/images/buttons/visibility/aircraft.svg b/client/public/themes/olympus/images/buttons/visibility/aircraft.svg new file mode 100644 index 00000000..6b19238d --- /dev/null +++ b/client/public/themes/olympus/images/buttons/visibility/aircraft.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/client/public/themes/olympus/images/buttons/visibility/groundunit-other.svg b/client/public/themes/olympus/images/buttons/visibility/groundunit-other.svg new file mode 100644 index 00000000..ef41b8b1 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/visibility/groundunit-other.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/client/public/themes/olympus/images/buttons/visibility/groundunit-sam.svg b/client/public/themes/olympus/images/buttons/visibility/groundunit-sam.svg new file mode 100644 index 00000000..d75e0075 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/visibility/groundunit-sam.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/client/public/themes/olympus/images/buttons/visibility/navyunit.svg b/client/public/themes/olympus/images/buttons/visibility/navyunit.svg new file mode 100644 index 00000000..3810ab30 --- /dev/null +++ b/client/public/themes/olympus/images/buttons/visibility/navyunit.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/client/public/themes/olympus/images/buttons/visibility/threatring.svg b/client/public/themes/olympus/images/buttons/visibility/threatring.svg new file mode 100644 index 00000000..6fff5bfe --- /dev/null +++ b/client/public/themes/olympus/images/buttons/visibility/threatring.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/client/public/themes/olympus/images/icons_form_abreast_dark.svg b/client/public/themes/olympus/images/formations/icons_form_abreast_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_abreast_dark.svg rename to client/public/themes/olympus/images/formations/icons_form_abreast_dark.svg diff --git a/client/public/themes/olympus/images/icons_form_abreast_light.svg b/client/public/themes/olympus/images/formations/icons_form_abreast_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_abreast_light.svg rename to client/public/themes/olympus/images/formations/icons_form_abreast_light.svg diff --git a/client/public/themes/olympus/images/icons_form_admin_dark.svg b/client/public/themes/olympus/images/formations/icons_form_admin_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_admin_dark.svg rename to client/public/themes/olympus/images/formations/icons_form_admin_dark.svg diff --git a/client/public/themes/olympus/images/icons_form_admin_light.svg b/client/public/themes/olympus/images/formations/icons_form_admin_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_admin_light.svg rename to client/public/themes/olympus/images/formations/icons_form_admin_light.svg diff --git a/client/public/themes/olympus/images/icons_form_echelon_dark.svg b/client/public/themes/olympus/images/formations/icons_form_echelon_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_echelon_dark.svg rename to client/public/themes/olympus/images/formations/icons_form_echelon_dark.svg diff --git a/client/public/themes/olympus/images/icons_form_echelon_light.svg b/client/public/themes/olympus/images/formations/icons_form_echelon_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_echelon_light.svg rename to client/public/themes/olympus/images/formations/icons_form_echelon_light.svg diff --git a/client/public/themes/olympus/images/icons_form_trail_dark.svg b/client/public/themes/olympus/images/formations/icons_form_trail_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_trail_dark.svg rename to client/public/themes/olympus/images/formations/icons_form_trail_dark.svg diff --git a/client/public/themes/olympus/images/icons_form_trail_light.svg b/client/public/themes/olympus/images/formations/icons_form_trail_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_form_trail_light.svg rename to client/public/themes/olympus/images/formations/icons_form_trail_light.svg diff --git a/client/public/themes/olympus/images/icon_aa_blue.svg b/client/public/themes/olympus/images/icon_aa_blue.svg deleted file mode 100644 index 0cf7b80e..00000000 --- a/client/public/themes/olympus/images/icon_aa_blue.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_aa_blue_hover.svg b/client/public/themes/olympus/images/icon_aa_blue_hover.svg deleted file mode 100644 index 083607f2..00000000 --- a/client/public/themes/olympus/images/icon_aa_blue_hover.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aa_blue_selected.svg b/client/public/themes/olympus/images/icon_aa_blue_selected.svg deleted file mode 100644 index 8b2e45dc..00000000 --- a/client/public/themes/olympus/images/icon_aa_blue_selected.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aa_neutral.svg b/client/public/themes/olympus/images/icon_aa_neutral.svg deleted file mode 100644 index a420833b..00000000 --- a/client/public/themes/olympus/images/icon_aa_neutral.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_aa_neutral_hover.svg b/client/public/themes/olympus/images/icon_aa_neutral_hover.svg deleted file mode 100644 index 6ec81838..00000000 --- a/client/public/themes/olympus/images/icon_aa_neutral_hover.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aa_neutral_selected.svg b/client/public/themes/olympus/images/icon_aa_neutral_selected.svg deleted file mode 100644 index 5ea11a76..00000000 --- a/client/public/themes/olympus/images/icon_aa_neutral_selected.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aa_red.svg b/client/public/themes/olympus/images/icon_aa_red.svg deleted file mode 100644 index 9e048861..00000000 --- a/client/public/themes/olympus/images/icon_aa_red.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_aa_red_hover.svg b/client/public/themes/olympus/images/icon_aa_red_hover.svg deleted file mode 100644 index e878c07e..00000000 --- a/client/public/themes/olympus/images/icon_aa_red_hover.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aa_red_selected.svg b/client/public/themes/olympus/images/icon_aa_red_selected.svg deleted file mode 100644 index 7d7e78d3..00000000 --- a/client/public/themes/olympus/images/icon_aa_red_selected.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_airbase_neutral.svg b/client/public/themes/olympus/images/icon_airbase_neutral.svg deleted file mode 100644 index 43222171..00000000 --- a/client/public/themes/olympus/images/icon_airbase_neutral.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/client/public/themes/olympus/images/icon_airbase_red.svg b/client/public/themes/olympus/images/icon_airbase_red.svg deleted file mode 100644 index d95872f1..00000000 --- a/client/public/themes/olympus/images/icon_airbase_red.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_blue.svg b/client/public/themes/olympus/images/icon_aircraft_blue.svg deleted file mode 100644 index 7e547339..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_blue.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_blue_hover.svg b/client/public/themes/olympus/images/icon_aircraft_blue_hover.svg deleted file mode 100644 index 0b59ac37..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_blue_hover.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_blue_selected.svg b/client/public/themes/olympus/images/icon_aircraft_blue_selected.svg deleted file mode 100644 index 251084a6..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_blue_selected.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_neutral.svg b/client/public/themes/olympus/images/icon_aircraft_neutral.svg deleted file mode 100644 index 981602fd..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_neutral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_neutral_hover.svg b/client/public/themes/olympus/images/icon_aircraft_neutral_hover.svg deleted file mode 100644 index a35613bb..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_neutral_hover.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_neutral_selected.svg b/client/public/themes/olympus/images/icon_aircraft_neutral_selected.svg deleted file mode 100644 index 8dcdef70..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_neutral_selected.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_red.svg b/client/public/themes/olympus/images/icon_aircraft_red.svg deleted file mode 100644 index 5777ae70..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_red.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_red_hover.svg b/client/public/themes/olympus/images/icon_aircraft_red_hover.svg deleted file mode 100644 index d975fd7b..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_red_hover.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_aircraft_red_selected.svg b/client/public/themes/olympus/images/icon_aircraft_red_selected.svg deleted file mode 100644 index 702d4c27..00000000 --- a/client/public/themes/olympus/images/icon_aircraft_red_selected.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_bomb_blue.svg b/client/public/themes/olympus/images/icon_bomb_blue.svg deleted file mode 100644 index 136deb4f..00000000 --- a/client/public/themes/olympus/images/icon_bomb_blue.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_bomb_neutral.svg b/client/public/themes/olympus/images/icon_bomb_neutral.svg deleted file mode 100644 index e32f31b9..00000000 --- a/client/public/themes/olympus/images/icon_bomb_neutral.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_bomb_red.svg b/client/public/themes/olympus/images/icon_bomb_red.svg deleted file mode 100644 index c86bf6f4..00000000 --- a/client/public/themes/olympus/images/icon_bomb_red.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_building_blue_hover.svg b/client/public/themes/olympus/images/icon_building_blue_hover.svg deleted file mode 100644 index f67b9fe7..00000000 --- a/client/public/themes/olympus/images/icon_building_blue_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_building_blue_selected.svg b/client/public/themes/olympus/images/icon_building_blue_selected.svg deleted file mode 100644 index ad0e3fc1..00000000 --- a/client/public/themes/olympus/images/icon_building_blue_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_building_neutral.svg b/client/public/themes/olympus/images/icon_building_neutral.svg deleted file mode 100644 index b88ef5e9..00000000 --- a/client/public/themes/olympus/images/icon_building_neutral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_building_neutral_hover.svg b/client/public/themes/olympus/images/icon_building_neutral_hover.svg deleted file mode 100644 index 43784a42..00000000 --- a/client/public/themes/olympus/images/icon_building_neutral_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_building_neutral_selected.svg b/client/public/themes/olympus/images/icon_building_neutral_selected.svg deleted file mode 100644 index b009365c..00000000 --- a/client/public/themes/olympus/images/icon_building_neutral_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_building_red.svg b/client/public/themes/olympus/images/icon_building_red.svg deleted file mode 100644 index ff503707..00000000 --- a/client/public/themes/olympus/images/icon_building_red.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_building_red_hover.svg b/client/public/themes/olympus/images/icon_building_red_hover.svg deleted file mode 100644 index a5c99d6e..00000000 --- a/client/public/themes/olympus/images/icon_building_red_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_building_red_selected.svg b/client/public/themes/olympus/images/icon_building_red_selected.svg deleted file mode 100644 index 220ce1b9..00000000 --- a/client/public/themes/olympus/images/icon_building_red_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_death_blue.svg b/client/public/themes/olympus/images/icon_death_blue.svg deleted file mode 100644 index 24f20fbf..00000000 --- a/client/public/themes/olympus/images/icon_death_blue.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_death_neutral.svg b/client/public/themes/olympus/images/icon_death_neutral.svg deleted file mode 100644 index 295d54b5..00000000 --- a/client/public/themes/olympus/images/icon_death_neutral.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_death_red.svg b/client/public/themes/olympus/images/icon_death_red.svg deleted file mode 100644 index 11b521a1..00000000 --- a/client/public/themes/olympus/images/icon_death_red.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_ground_blue_hover.svg b/client/public/themes/olympus/images/icon_ground_blue_hover.svg deleted file mode 100644 index 764c9f9c..00000000 --- a/client/public/themes/olympus/images/icon_ground_blue_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ground_blue_selected.svg b/client/public/themes/olympus/images/icon_ground_blue_selected.svg deleted file mode 100644 index c3e77fbd..00000000 --- a/client/public/themes/olympus/images/icon_ground_blue_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ground_neutral.svg b/client/public/themes/olympus/images/icon_ground_neutral.svg deleted file mode 100644 index df956461..00000000 --- a/client/public/themes/olympus/images/icon_ground_neutral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_ground_neutral_hover.svg b/client/public/themes/olympus/images/icon_ground_neutral_hover.svg deleted file mode 100644 index fdd6e2e0..00000000 --- a/client/public/themes/olympus/images/icon_ground_neutral_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ground_neutral_selected.svg b/client/public/themes/olympus/images/icon_ground_neutral_selected.svg deleted file mode 100644 index d4651a2c..00000000 --- a/client/public/themes/olympus/images/icon_ground_neutral_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ground_red.svg b/client/public/themes/olympus/images/icon_ground_red.svg deleted file mode 100644 index bb78e1df..00000000 --- a/client/public/themes/olympus/images/icon_ground_red.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_ground_red_hover.svg b/client/public/themes/olympus/images/icon_ground_red_hover.svg deleted file mode 100644 index 7bce4e24..00000000 --- a/client/public/themes/olympus/images/icon_ground_red_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ground_red_selected.svg b/client/public/themes/olympus/images/icon_ground_red_selected.svg deleted file mode 100644 index afe9a623..00000000 --- a/client/public/themes/olympus/images/icon_ground_red_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_hold_blue.svg b/client/public/themes/olympus/images/icon_hold_blue.svg deleted file mode 100644 index 257c167a..00000000 --- a/client/public/themes/olympus/images/icon_hold_blue.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_hold_red.svg b/client/public/themes/olympus/images/icon_hold_red.svg deleted file mode 100644 index d2ec1a41..00000000 --- a/client/public/themes/olympus/images/icon_hold_red.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_missile_neutral.svg b/client/public/themes/olympus/images/icon_missile_neutral.svg deleted file mode 100644 index 73be3528..00000000 --- a/client/public/themes/olympus/images/icon_missile_neutral.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_missile_red.svg b/client/public/themes/olympus/images/icon_missile_red.svg deleted file mode 100644 index c16f8d00..00000000 --- a/client/public/themes/olympus/images/icon_missile_red.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_navyuni_blue.svg b/client/public/themes/olympus/images/icon_navyuni_blue.svg deleted file mode 100644 index e2d296d0..00000000 --- a/client/public/themes/olympus/images/icon_navyuni_blue.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_navyunit_neutral.svg b/client/public/themes/olympus/images/icon_navyunit_neutral.svg deleted file mode 100644 index 13a87c0b..00000000 --- a/client/public/themes/olympus/images/icon_navyunit_neutral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_navyunit_red.svg b/client/public/themes/olympus/images/icon_navyunit_red.svg deleted file mode 100644 index 91a0aff9..00000000 --- a/client/public/themes/olympus/images/icon_navyunit_red.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_rtb_blue.svg b/client/public/themes/olympus/images/icon_rtb_blue.svg deleted file mode 100644 index 0ddecdf6..00000000 --- a/client/public/themes/olympus/images/icon_rtb_blue.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_rtb_neutral.svg b/client/public/themes/olympus/images/icon_rtb_neutral.svg deleted file mode 100644 index 66803354..00000000 --- a/client/public/themes/olympus/images/icon_rtb_neutral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_sam_blue.svg b/client/public/themes/olympus/images/icon_sam_blue.svg deleted file mode 100644 index bc8729c1..00000000 --- a/client/public/themes/olympus/images/icon_sam_blue.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_sam_neutral.svg b/client/public/themes/olympus/images/icon_sam_neutral.svg deleted file mode 100644 index 9eb5ab0b..00000000 --- a/client/public/themes/olympus/images/icon_sam_neutral.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_sam_red.svg b/client/public/themes/olympus/images/icon_sam_red.svg deleted file mode 100644 index 36aac80d..00000000 --- a/client/public/themes/olympus/images/icon_sam_red.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_ship_blue.svg b/client/public/themes/olympus/images/icon_ship_blue.svg deleted file mode 100644 index a981861f..00000000 --- a/client/public/themes/olympus/images/icon_ship_blue.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_ship_blue_hover.svg b/client/public/themes/olympus/images/icon_ship_blue_hover.svg deleted file mode 100644 index 34b0fe59..00000000 --- a/client/public/themes/olympus/images/icon_ship_blue_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ship_blue_selected.svg b/client/public/themes/olympus/images/icon_ship_blue_selected.svg deleted file mode 100644 index f472cd42..00000000 --- a/client/public/themes/olympus/images/icon_ship_blue_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ship_neutral.svg b/client/public/themes/olympus/images/icon_ship_neutral.svg deleted file mode 100644 index df1643d9..00000000 --- a/client/public/themes/olympus/images/icon_ship_neutral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_ship_neutral_hover.svg b/client/public/themes/olympus/images/icon_ship_neutral_hover.svg deleted file mode 100644 index 2e332bcd..00000000 --- a/client/public/themes/olympus/images/icon_ship_neutral_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ship_neutral_selected.svg b/client/public/themes/olympus/images/icon_ship_neutral_selected.svg deleted file mode 100644 index 6a7e36e3..00000000 --- a/client/public/themes/olympus/images/icon_ship_neutral_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ship_red.svg b/client/public/themes/olympus/images/icon_ship_red.svg deleted file mode 100644 index f130f9f3..00000000 --- a/client/public/themes/olympus/images/icon_ship_red.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icon_ship_red_hover.svg b/client/public/themes/olympus/images/icon_ship_red_hover.svg deleted file mode 100644 index 7233b4e1..00000000 --- a/client/public/themes/olympus/images/icon_ship_red_hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icon_ship_red_selected.svg b/client/public/themes/olympus/images/icon_ship_red_selected.svg deleted file mode 100644 index 0c41f7c2..00000000 --- a/client/public/themes/olympus/images/icon_ship_red_selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/icons_actions_180_dark.svg b/client/public/themes/olympus/images/icons_actions_180_dark.svg deleted file mode 100644 index 79e0ade7..00000000 --- a/client/public/themes/olympus/images/icons_actions_180_dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/icons_actions_cancel_dark.svg b/client/public/themes/olympus/images/icons_actions_cancel_dark.svg deleted file mode 100644 index 3582a48c..00000000 --- a/client/public/themes/olympus/images/icons_actions_cancel_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_actions_gas_dark.svg b/client/public/themes/olympus/images/icons_actions_gas_dark.svg deleted file mode 100644 index 4a5d7357..00000000 --- a/client/public/themes/olympus/images/icons_actions_gas_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_actions_nothing_dark.svg b/client/public/themes/olympus/images/icons_actions_nothing_dark.svg deleted file mode 100644 index f6bb0463..00000000 --- a/client/public/themes/olympus/images/icons_actions_nothing_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_actions_rtb_dark.svg b/client/public/themes/olympus/images/icons_actions_rtb_dark.svg deleted file mode 100644 index 081bff14..00000000 --- a/client/public/themes/olympus/images/icons_actions_rtb_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_actions_search_dark.svg b/client/public/themes/olympus/images/icons_actions_search_dark.svg deleted file mode 100644 index 497481c1..00000000 --- a/client/public/themes/olympus/images/icons_actions_search_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_attack_dark.svg b/client/public/themes/olympus/images/icons_roe_attack_dark.svg deleted file mode 100644 index db976cbb..00000000 --- a/client/public/themes/olympus/images/icons_roe_attack_dark.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/client/public/themes/olympus/images/icons_roe_attack_light.svg b/client/public/themes/olympus/images/icons_roe_attack_light.svg deleted file mode 100644 index 06ff8bb3..00000000 --- a/client/public/themes/olympus/images/icons_roe_attack_light.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/client/public/themes/olympus/images/icons_roe_defend_dark.svg b/client/public/themes/olympus/images/icons_roe_defend_dark.svg deleted file mode 100644 index 82c305aa..00000000 --- a/client/public/themes/olympus/images/icons_roe_defend_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_defend_light.svg b/client/public/themes/olympus/images/icons_roe_defend_light.svg deleted file mode 100644 index 1d956938..00000000 --- a/client/public/themes/olympus/images/icons_roe_defend_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_free_dark.svg b/client/public/themes/olympus/images/icons_roe_free_dark.svg deleted file mode 100644 index a3b0b02f..00000000 --- a/client/public/themes/olympus/images/icons_roe_free_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_free_light.svg b/client/public/themes/olympus/images/icons_roe_free_light.svg deleted file mode 100644 index 1fdf5d13..00000000 --- a/client/public/themes/olympus/images/icons_roe_free_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_return_dark.svg b/client/public/themes/olympus/images/icons_roe_return_dark.svg deleted file mode 100644 index e42485a7..00000000 --- a/client/public/themes/olympus/images/icons_roe_return_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_return_light.svg b/client/public/themes/olympus/images/icons_roe_return_light.svg deleted file mode 100644 index 030534d7..00000000 --- a/client/public/themes/olympus/images/icons_roe_return_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_stop_dark.svg b/client/public/themes/olympus/images/icons_roe_stop_dark.svg deleted file mode 100644 index 3582a48c..00000000 --- a/client/public/themes/olympus/images/icons_roe_stop_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_stop_light.svg b/client/public/themes/olympus/images/icons_roe_stop_light.svg deleted file mode 100644 index dc3335a8..00000000 --- a/client/public/themes/olympus/images/icons_roe_stop_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_target_dark.svg b/client/public/themes/olympus/images/icons_roe_target_dark.svg deleted file mode 100644 index cb68d86b..00000000 --- a/client/public/themes/olympus/images/icons_roe_target_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_roe_target_light.svg b/client/public/themes/olympus/images/icons_roe_target_light.svg deleted file mode 100644 index a9ec508c..00000000 --- a/client/public/themes/olympus/images/icons_roe_target_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_threat_cms_dark.svg b/client/public/themes/olympus/images/icons_threat_cms_dark.svg deleted file mode 100644 index f6f53fd5..00000000 --- a/client/public/themes/olympus/images/icons_threat_cms_dark.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/public/themes/olympus/images/icons_threat_cms_light.svg b/client/public/themes/olympus/images/icons_threat_cms_light.svg deleted file mode 100644 index 6032f934..00000000 --- a/client/public/themes/olympus/images/icons_threat_cms_light.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/public/themes/olympus/images/icons_threat_defend_dark.svg b/client/public/themes/olympus/images/icons_threat_defend_dark.svg deleted file mode 100644 index 962971eb..00000000 --- a/client/public/themes/olympus/images/icons_threat_defend_dark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/public/themes/olympus/images/icons_threat_defend_light.svg b/client/public/themes/olympus/images/icons_threat_defend_light.svg deleted file mode 100644 index 0e598866..00000000 --- a/client/public/themes/olympus/images/icons_threat_defend_light.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/public/themes/olympus/images/icons_threat_nothing_dark.svg b/client/public/themes/olympus/images/icons_threat_nothing_dark.svg deleted file mode 100644 index 3582a48c..00000000 --- a/client/public/themes/olympus/images/icons_threat_nothing_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_threat_nothing_light.svg b/client/public/themes/olympus/images/icons_threat_nothing_light.svg deleted file mode 100644 index dc3335a8..00000000 --- a/client/public/themes/olympus/images/icons_threat_nothing_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_threat_protect_dark.svg b/client/public/themes/olympus/images/icons_threat_protect_dark.svg deleted file mode 100644 index 97c1deb0..00000000 --- a/client/public/themes/olympus/images/icons_threat_protect_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_threat_protect_light.svg b/client/public/themes/olympus/images/icons_threat_protect_light.svg deleted file mode 100644 index a3ae6b88..00000000 --- a/client/public/themes/olympus/images/icons_threat_protect_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_threat_retreat_dark.svg b/client/public/themes/olympus/images/icons_threat_retreat_dark.svg deleted file mode 100644 index cb31ee40..00000000 --- a/client/public/themes/olympus/images/icons_threat_retreat_dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icons_threat_retreat_light.svg b/client/public/themes/olympus/images/icons_threat_retreat_light.svg deleted file mode 100644 index e17d43f4..00000000 --- a/client/public/themes/olympus/images/icons_threat_retreat_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/public/themes/olympus/images/icon_airbase_blue.svg b/client/public/themes/olympus/images/mission/airbase.svg similarity index 100% rename from client/public/themes/olympus/images/icon_airbase_blue.svg rename to client/public/themes/olympus/images/mission/airbase.svg diff --git a/client/public/themes/olympus/images/check_square.svg b/client/public/themes/olympus/images/other/check_square.svg similarity index 100% rename from client/public/themes/olympus/images/check_square.svg rename to client/public/themes/olympus/images/other/check_square.svg diff --git a/client/public/themes/olympus/images/chevron-down.svg b/client/public/themes/olympus/images/other/chevron-down.svg similarity index 100% rename from client/public/themes/olympus/images/chevron-down.svg rename to client/public/themes/olympus/images/other/chevron-down.svg diff --git a/client/public/themes/olympus/images/icons_misc_brush_blue.svg b/client/public/themes/olympus/images/other/icons_misc_brush_blue.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_brush_blue.svg rename to client/public/themes/olympus/images/other/icons_misc_brush_blue.svg diff --git a/client/public/themes/olympus/images/icons_misc_brush_dark.svg b/client/public/themes/olympus/images/other/icons_misc_brush_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_brush_dark.svg rename to client/public/themes/olympus/images/other/icons_misc_brush_dark.svg diff --git a/client/public/themes/olympus/images/icons_misc_brush_light.svg b/client/public/themes/olympus/images/other/icons_misc_brush_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_brush_light.svg rename to client/public/themes/olympus/images/other/icons_misc_brush_light.svg diff --git a/client/public/themes/olympus/images/icons_misc_gas_blue.svg b/client/public/themes/olympus/images/other/icons_misc_gas_blue.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_gas_blue.svg rename to client/public/themes/olympus/images/other/icons_misc_gas_blue.svg diff --git a/client/public/themes/olympus/images/icons_misc_gas_dark.svg b/client/public/themes/olympus/images/other/icons_misc_gas_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_gas_dark.svg rename to client/public/themes/olympus/images/other/icons_misc_gas_dark.svg diff --git a/client/public/themes/olympus/images/icons_misc_gas_light.svg b/client/public/themes/olympus/images/other/icons_misc_gas_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_gas_light.svg rename to client/public/themes/olympus/images/other/icons_misc_gas_light.svg diff --git a/client/public/themes/olympus/images/icons_misc_map_blue.svg b/client/public/themes/olympus/images/other/icons_misc_map_blue.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_map_blue.svg rename to client/public/themes/olympus/images/other/icons_misc_map_blue.svg diff --git a/client/public/themes/olympus/images/icons_misc_map_dark.svg b/client/public/themes/olympus/images/other/icons_misc_map_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_map_dark.svg rename to client/public/themes/olympus/images/other/icons_misc_map_dark.svg diff --git a/client/public/themes/olympus/images/icons_misc_map_light.svg b/client/public/themes/olympus/images/other/icons_misc_map_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_map_light.svg rename to client/public/themes/olympus/images/other/icons_misc_map_light.svg diff --git a/client/public/themes/olympus/images/icons_misc_plane_blue.svg b/client/public/themes/olympus/images/other/icons_misc_plane_blue.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_plane_blue.svg rename to client/public/themes/olympus/images/other/icons_misc_plane_blue.svg diff --git a/client/public/themes/olympus/images/icons_misc_plane_dark.svg b/client/public/themes/olympus/images/other/icons_misc_plane_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_plane_dark.svg rename to client/public/themes/olympus/images/other/icons_misc_plane_dark.svg diff --git a/client/public/themes/olympus/images/icons_misc_plane_light.svg b/client/public/themes/olympus/images/other/icons_misc_plane_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_plane_light.svg rename to client/public/themes/olympus/images/other/icons_misc_plane_light.svg diff --git a/client/public/themes/olympus/images/icons_misc_settings_blue.svg b/client/public/themes/olympus/images/other/icons_misc_settings_blue.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_settings_blue.svg rename to client/public/themes/olympus/images/other/icons_misc_settings_blue.svg diff --git a/client/public/themes/olympus/images/icons_misc_settings_dark.svg b/client/public/themes/olympus/images/other/icons_misc_settings_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_settings_dark.svg rename to client/public/themes/olympus/images/other/icons_misc_settings_dark.svg diff --git a/client/public/themes/olympus/images/icons_misc_settings_light.svg b/client/public/themes/olympus/images/other/icons_misc_settings_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_settings_light.svg rename to client/public/themes/olympus/images/other/icons_misc_settings_light.svg diff --git a/client/public/themes/olympus/images/icons_misc_visible_blue.svg b/client/public/themes/olympus/images/other/icons_misc_visible_blue.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_visible_blue.svg rename to client/public/themes/olympus/images/other/icons_misc_visible_blue.svg diff --git a/client/public/themes/olympus/images/icons_misc_visible_dark.svg b/client/public/themes/olympus/images/other/icons_misc_visible_dark.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_visible_dark.svg rename to client/public/themes/olympus/images/other/icons_misc_visible_dark.svg diff --git a/client/public/themes/olympus/images/icons_misc_visible_light.svg b/client/public/themes/olympus/images/other/icons_misc_visible_light.svg similarity index 100% rename from client/public/themes/olympus/images/icons_misc_visible_light.svg rename to client/public/themes/olympus/images/other/icons_misc_visible_light.svg diff --git a/client/public/themes/olympus/images/map_source.svg b/client/public/themes/olympus/images/other/map_source.svg similarity index 100% rename from client/public/themes/olympus/images/map_source.svg rename to client/public/themes/olympus/images/other/map_source.svg diff --git a/client/public/themes/olympus/images/state_idle.svg b/client/public/themes/olympus/images/state_idle.svg deleted file mode 100644 index 757ee216..00000000 --- a/client/public/themes/olympus/images/state_idle.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/state_rtb.svg b/client/public/themes/olympus/images/state_rtb.svg deleted file mode 100644 index f40e2627..00000000 --- a/client/public/themes/olympus/images/state_rtb.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/state_attack.svg b/client/public/themes/olympus/images/states/attack.svg similarity index 100% rename from client/public/themes/olympus/images/state_attack.svg rename to client/public/themes/olympus/images/states/attack.svg diff --git a/client/public/themes/olympus/images/state_dcs.svg b/client/public/themes/olympus/images/states/dcs.svg similarity index 100% rename from client/public/themes/olympus/images/state_dcs.svg rename to client/public/themes/olympus/images/states/dcs.svg diff --git a/client/public/themes/olympus/images/state_follow.svg b/client/public/themes/olympus/images/states/follow.svg similarity index 100% rename from client/public/themes/olympus/images/state_follow.svg rename to client/public/themes/olympus/images/states/follow.svg diff --git a/client/public/themes/olympus/images/state_human.svg b/client/public/themes/olympus/images/states/human.svg similarity index 100% rename from client/public/themes/olympus/images/state_human.svg rename to client/public/themes/olympus/images/states/human.svg diff --git a/client/public/themes/olympus/images/icon_hold_neutral.svg b/client/public/themes/olympus/images/states/idle.svg similarity index 100% rename from client/public/themes/olympus/images/icon_hold_neutral.svg rename to client/public/themes/olympus/images/states/idle.svg diff --git a/client/public/themes/olympus/images/state_refuel.svg b/client/public/themes/olympus/images/states/refuel.svg similarity index 100% rename from client/public/themes/olympus/images/state_refuel.svg rename to client/public/themes/olympus/images/states/refuel.svg diff --git a/client/public/themes/olympus/images/icon_rtb_red.svg b/client/public/themes/olympus/images/states/rtb.svg similarity index 100% rename from client/public/themes/olympus/images/icon_rtb_red.svg rename to client/public/themes/olympus/images/states/rtb.svg diff --git a/client/public/themes/olympus/images/task_tanker.svg b/client/public/themes/olympus/images/task_tanker.svg deleted file mode 100644 index 32ee5980..00000000 --- a/client/public/themes/olympus/images/task_tanker.svg +++ /dev/null @@ -1,1256 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/client/public/themes/olympus/images/units/aircraft.svg b/client/public/themes/olympus/images/units/aircraft.svg index f714a9af..c932ee11 100644 --- a/client/public/themes/olympus/images/units/aircraft.svg +++ b/client/public/themes/olympus/images/units/aircraft.svg @@ -1,4 +1,4 @@ - + diff --git a/client/public/themes/olympus/images/units/bomb.svg b/client/public/themes/olympus/images/units/bomb.svg new file mode 100644 index 00000000..b4447e5c --- /dev/null +++ b/client/public/themes/olympus/images/units/bomb.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/public/themes/olympus/images/units/death.svg b/client/public/themes/olympus/images/units/death.svg new file mode 100644 index 00000000..acb3d38a --- /dev/null +++ b/client/public/themes/olympus/images/units/death.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/public/themes/olympus/images/icon_ground_blue.svg b/client/public/themes/olympus/images/units/groundunit-other.svg similarity index 52% rename from client/public/themes/olympus/images/icon_ground_blue.svg rename to client/public/themes/olympus/images/units/groundunit-other.svg index 8b44edf7..a60bf5ea 100644 --- a/client/public/themes/olympus/images/icon_ground_blue.svg +++ b/client/public/themes/olympus/images/units/groundunit-other.svg @@ -1,4 +1,5 @@ - + + diff --git a/client/public/themes/olympus/images/units/groundunit-sam.svg b/client/public/themes/olympus/images/units/groundunit-sam.svg new file mode 100644 index 00000000..6d5b0390 --- /dev/null +++ b/client/public/themes/olympus/images/units/groundunit-sam.svg @@ -0,0 +1,4 @@ + + + + diff --git a/client/public/themes/olympus/images/icon_missile_blue.svg b/client/public/themes/olympus/images/units/missile.svg similarity index 66% rename from client/public/themes/olympus/images/icon_missile_blue.svg rename to client/public/themes/olympus/images/units/missile.svg index 51124e12..ecce0114 100644 --- a/client/public/themes/olympus/images/icon_missile_blue.svg +++ b/client/public/themes/olympus/images/units/missile.svg @@ -1,5 +1,5 @@ - + diff --git a/client/public/themes/olympus/images/units/navyunit.svg b/client/public/themes/olympus/images/units/navyunit.svg new file mode 100644 index 00000000..d6c82025 --- /dev/null +++ b/client/public/themes/olympus/images/units/navyunit.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/client/public/themes/olympus/images/icon_building_blue.svg b/client/public/themes/olympus/images/units/static.svg similarity index 58% rename from client/public/themes/olympus/images/icon_building_blue.svg rename to client/public/themes/olympus/images/units/static.svg index 7f86143a..b986a43f 100644 --- a/client/public/themes/olympus/images/icon_building_blue.svg +++ b/client/public/themes/olympus/images/units/static.svg @@ -1,4 +1,5 @@ - + + diff --git a/client/public/themes/olympus/images/visibility_aircraft_hidden.svg b/client/public/themes/olympus/images/visibility_aircraft_hidden.svg deleted file mode 100644 index 7acbb8dd..00000000 --- a/client/public/themes/olympus/images/visibility_aircraft_hidden.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/visibility_aircraft_visible.svg b/client/public/themes/olympus/images/visibility_aircraft_visible.svg deleted file mode 100644 index 000472f4..00000000 --- a/client/public/themes/olympus/images/visibility_aircraft_visible.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/visibility_ground_hidden.svg b/client/public/themes/olympus/images/visibility_ground_hidden.svg deleted file mode 100644 index 4993ba3e..00000000 --- a/client/public/themes/olympus/images/visibility_ground_hidden.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/client/public/themes/olympus/images/visibility_ground_visible.svg b/client/public/themes/olympus/images/visibility_ground_visible.svg deleted file mode 100644 index 4f14666c..00000000 --- a/client/public/themes/olympus/images/visibility_ground_visible.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/client/public/themes/olympus/images/visibility_navyunit_hidden.svg b/client/public/themes/olympus/images/visibility_navyunit_hidden.svg deleted file mode 100644 index 48a521bb..00000000 --- a/client/public/themes/olympus/images/visibility_navyunit_hidden.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/visibility_navyunit_visible.svg b/client/public/themes/olympus/images/visibility_navyunit_visible.svg deleted file mode 100644 index bfba32a8..00000000 --- a/client/public/themes/olympus/images/visibility_navyunit_visible.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/images/visibility_sam_hidden.svg b/client/public/themes/olympus/images/visibility_sam_hidden.svg deleted file mode 100644 index cb9d0a10..00000000 --- a/client/public/themes/olympus/images/visibility_sam_hidden.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/client/public/themes/olympus/images/visibility_sam_visible.svg b/client/public/themes/olympus/images/visibility_sam_visible.svg deleted file mode 100644 index 4beca510..00000000 --- a/client/public/themes/olympus/images/visibility_sam_visible.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/client/public/themes/olympus/images/visibility_threat_hidden.svg b/client/public/themes/olympus/images/visibility_threat_hidden.svg deleted file mode 100644 index 2fb993f1..00000000 --- a/client/public/themes/olympus/images/visibility_threat_hidden.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/public/themes/olympus/images/visibility_threat_visible.svg b/client/public/themes/olympus/images/visibility_threat_visible.svg deleted file mode 100644 index 6a5580de..00000000 --- a/client/public/themes/olympus/images/visibility_threat_visible.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/client/public/themes/olympus/theme.css b/client/public/themes/olympus/theme.css index 06595b96..01af652e 100644 --- a/client/public/themes/olympus/theme.css +++ b/client/public/themes/olympus/theme.css @@ -1,22 +1,22 @@ :root { - /** Colours **/ - /*** Coalition: neutral **/ + /*** Coalition: neutral ***/ --primary-neutral: #949ba7; --secondary-neutral-outline: #111111; --secondary-neutral-text: #111111; - /*** Coalition: blue **/ + /*** Coalition: blue ***/ --primary-blue: #247be2; --secondary-blue-outline: #082e44; --secondary-blue-text: #017DC1; - /*** Coalition: red **/ + /*** Coalition: red ***/ --primary-red: #ff5858; --secondary-red-outline: #262222; --secondary-red-text: #D42121; + /*** UI Colours **/ --accent-green: #8bff63; --accent-light-blue: #5ca7ff; --accent-light-red: #F5B6B6; @@ -43,25 +43,9 @@ --border-radius-md: 10px; --border-radius-lg: 15px; - /*** Font stuff **/ + /*** Fonts **/ --font-weight-bolder: 600; - /*** Navbar ***/ - --visibility-control-aircraft-visible-url: url("/themes/olympus/images/visibility_aircraft_visible.svg"); - --visibility-control-aircraft-hidden-url: url("/themes/olympus/images/visibility_aircraft_hidden.svg"); - - --visibility-control-groundunit-visible-url: url("/themes/olympus/images/visibility_ground_visible.svg"); - --visibility-control-groundunit-hidden-url: url("/themes/olympus/images/visibility_ground_hidden.svg"); - - --visibility-control-sam-visible-url: url("/themes/olympus/images/visibility_sam_visible.svg"); - --visibility-control-sam-hidden-url: url("/themes/olympus/images/visibility_sam_hidden.svg"); - - --visibility-control-navyunit-visible-url: url("/themes/olympus/images/visibility_navyunit_visible.svg"); - --visibility-control-navyunit-hidden-url: url("/themes/olympus/images/visibility_navyunit_hidden.svg"); - - --visibility-control-threat-visible-url: url("/themes/olympus/images/visibility_threat_visible.svg"); - --visibility-control-threat-hidden-url: url("/themes/olympus/images/visibility_threat_hidden.svg"); - /*** Unit marker settings ***/ /*** All markers **/ --unit-border-radius: var(--border-radius-xs); @@ -89,111 +73,4 @@ --unit-aircraft-fuel-y: 22px; --unit-aircraft-height: 28px; --unit-aircraft-vvi-width: 4px; - --unit-aircraft-width: var(--unit-aircraft-height); - - --unit-aircraft-marker-height: 50px; - --unit-aircraft-marker-width: 50px; - - --unit-aircraft-icon: url("/resources/theme/images/units/aircraft.svg"); - - /*** Air units' states ***/ - --unit-aircraft-state-height: 50px; - --unit-aircraft-state-width: 50px; - - --unit-aircraft-state-rtb: url("/themes/olympus/images/state_rtb.svg"); - --unit-aircraft-state-idle: url("/themes/olympus/images/state_idle.svg"); - --unit-aircraft-state-attack: url("/themes/olympus/images/state_attack.svg"); - --unit-aircraft-state-follow: url("/themes/olympus/images/state_follow.svg"); - --unit-aircraft-state-refuel: url("/themes/olympus/images/state_refuel.svg"); - --unit-aircraft-state-human: url("/themes/olympus/images/state_human.svg"); - --unit-aircraft-state-dcs: url("/themes/olympus/images/state_dcs.svg"); - - /*** Ground ***/ - --unit-groundunit-marker-height: 50px; - --unit-groundunit-marker-width: 50px; - - --unit-groundunit-marker-blue-url: url("/themes/olympus/images/icon_ground_blue.svg"); - --unit-groundunit-marker-blue-hover-url: url("/themes/olympus/images/icon_ground_blue_hover.svg"); - --unit-groundunit-marker-blue-selected-url: url("/themes/olympus/images/icon_ground_blue_selected.svg"); - - --unit-groundunit-marker-neutral-url: url("/themes/olympus/images/icon_ground_neutral.svg"); - --unit-groundunit-marker-neutral-hover-url: url("/themes/olympus/images/icon_ground_neutral_hover.svg"); - --unit-groundunit-marker-neutral-selected-url: url("/themes/olympus/images/icon_ground_neutral_selected.svg"); - - --unit-groundunit-marker-red-url: url("/themes/olympus/images/icon_ground_red.svg"); - --unit-groundunit-marker-red-hover-url: url("/themes/olympus/images/icon_ground_red_hover.svg"); - --unit-groundunit-marker-red-selected-url: url("/themes/olympus/images/icon_ground_red_selected.svg"); - - - /*** SAMs ***/ - --unit-sam-marker-height: 50px; - --unit-sam-marker-width: 50px; - - --unit-sam-marker-blue-url: url("/themes/olympus/images/icon_aa_blue.svg"); - --unit-sam-marker-blue-hover-url: url("/themes/olympus/images/icon_aa_blue_hover.svg"); - --unit-sam-marker-blue-selected-url: url("/themes/olympus/images/icon_aa_blue_selected.svg"); - - --unit-sam-marker-neutral-url: url("/themes/olympus/images/icon_aa_neutral.svg"); - --unit-sam-marker-neutral-hover-url: url("/themes/olympus/images/icon_aa_neutral_hover.svg"); - --unit-sam-marker-neutral-selected-url: url("/themes/olympus/images/icon_aa_neutral_selected.svg"); - - --unit-sam-marker-red-url: url("/themes/olympus/images/icon_aa_red.svg"); - --unit-sam-marker-red-hover-url: url("/themes/olympus/images/icon_aa_red_hover.svg"); - --unit-sam-marker-red-selected-url: url("/themes/olympus/images/icon_aa_red_selected.svg"); - - - /*** navyunit ***/ - --unit-navyunit-marker-height: 50px; - --unit-navyunit-marker-width: 50px; - - --unit-navyunit-marker-blue-url: url("/themes/olympus/images/icon_ship_blue.svg"); - --unit-navyunit-marker-blue-hover-url: url("/themes/olympus/images/icon_ship_blue_hover.svg"); - --unit-navyunit-marker-blue-selected-url: url("/themes/olympus/images/icon_ship_blue_selected.svg"); - - --unit-navyunit-marker-neutral-url: url("/themes/olympus/images/icon_ship_neutral.svg"); - --unit-navyunit-marker-neutral-hover-url: url("/themes/olympus/images/icon_ship_neutral_hover.svg"); - --unit-navyunit-marker-neutral-selected-url: url("/themes/olympus/images/icon_ship_neutral_selected.svg"); - - --unit-navyunit-marker-red-url: url("/themes/olympus/images/icon_ship_red.svg"); - --unit-navyunit-marker-red-hover-url: url("/themes/olympus/images/icon_ship_red_hover.svg"); - --unit-navyunit-marker-red-selected-url: url("/themes/olympus/images/icon_ship_red_selected.svg"); - - - /*** Building ***/ - --unit-building-marker-height: 50px; - --unit-building-marker-width: 50px; - - --unit-building-marker-blue-url: url("/themes/olympus/images/icon_building_blue.svg"); - --unit-building-marker-neutral-url: url("/themes/olympus/images/icon_building_neutral.svg"); - --unit-building-marker-red-url: url("/themes/olympus/images/icon_building_red.svg"); - - - /*** Weapons ***/ - --unit-missile-marker-height: 50px; - --unit-missile-marker-width: 50px; - - --unit-missile-marker-blue-url: url("/themes/olympus/images/icon_missile_blue.svg"); - --unit-missile-marker-neutral-url: url("/themes/olympus/images/icon_missile_neutral.svg"); - --unit-missile-marker-red-url: url("/themes/olympus/images/icon_missile_red.svg"); - - --unit-bomb-marker-height: 50px; - --unit-bomb-marker-width: 50px; - - --unit-bomb-marker-blue-url: url("/themes/olympus/images/icon_bomb_blue.svg"); - --unit-bomb-marker-neutral-url: url("/themes/olympus/images/icon_bomb_neutral.svg"); - --unit-bomb-marker-red-url: url("/themes/olympus/images/icon_bomb_red.svg"); - - - /*** Context menu ***/ - --spawn-aircraft-url: url("/themes/olympus/images/spawn_aircraft.svg"); - --spawn-groundunit-url: url("/themes/olympus/images/spawn_ground.svg"); - --spawn-smoke-url: url("/themes/olympus/images/spawn_smoke.svg"); - - /*** Airbase ***/ - --airbase-marker-height: 63px; - --airbase-marker-width: 63px; - - --airbase-marker-blue-url: url("/themes/olympus/images/icon_airbase_blue.svg"); - --airbase-marker-neutral-url: url("/themes/olympus/images/icon_airbase_neutral.svg"); - --airbase-marker-red-url: url("/themes/olympus/images/icon_airbase_red.svg"); } \ No newline at end of file diff --git a/client/routes/resources.js b/client/routes/resources.js index 6e6778bb..2be3af2f 100644 --- a/client/routes/resources.js +++ b/client/routes/resources.js @@ -1,31 +1,10 @@ const express = require('express'); const router = express.Router(); -const fs = require('fs'); -const path = require('path'); -const url = require('url'); var theme = "olympus"; router.get('/theme/*', function (req, res, next) { - if (url.parse(req.url).pathname.slice(-4).toLowerCase() === ".svg") - { - const localPath = path.join(__dirname, '..', 'public', url.parse(req.url).pathname.replace("theme", "themes/" + theme)); - fs.readFile(localPath, function(err, data) { - if (err) { - res.sendStatus(404); - } else { - var svgString = data.toString('utf8'); - for (key in req.query) - svgString = svgString.replaceAll(key, req.query[key]); - - res.header('Content-Type', 'image/svg+xml'); - res.send(svgString); - } - }); - } - else { - res.redirect(req.url.replace("theme", "themes/" + theme)); - } + res.redirect(req.url.replace("theme", "themes/" + theme)); }); module.exports = router; diff --git a/client/src/index.ts b/client/src/index.ts index 436b3838..2a2dc3ae 100644 --- a/client/src/index.ts +++ b/client/src/index.ts @@ -16,6 +16,8 @@ import { Popup } from "./popups/popup"; import { Dropdown } from "./controls/dropdown"; import { HotgroupPanel } from "./panels/hotgrouppanel"; +import "@iconfu/svg-inject"; + var map: Map; var unitsManager: UnitsManager; @@ -214,6 +216,7 @@ function setupEvents() { document.addEventListener("reloadPage", () => { location.reload(); }) + } export function getMap() { diff --git a/client/src/map/map.ts b/client/src/map/map.ts index a1f18db7..682c6cc9 100644 --- a/client/src/map/map.ts +++ b/client/src/map/map.ts @@ -115,6 +115,7 @@ export class Map extends L.Map { }); document.addEventListener("toggleUnitVisibility", (ev: CustomEventInit) => { + ev.detail._element.classList.toggle("off"); document.body.toggleAttribute("data-hide-" + ev.detail.category); Object.values(getUnitsManager().getUnits()).forEach((unit: Unit) => unit.updateVisibility()); }); diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts index db1df72d..9f6ef22e 100644 --- a/client/src/panels/unitcontrolpanel.ts +++ b/client/src/panels/unitcontrolpanel.ts @@ -56,15 +56,15 @@ export class UnitControlPanel extends Panel { /* Option buttons */ this.#optionButtons["ROE"] = ROEs.map((option: string, index: number) => { - return this.#createOptionButton(option, ROEDescriptions[index], () => { getUnitsManager().selectedUnitsSetROE(option); }); + return this.#createOptionButton(option, `roe/${option.toLowerCase()}.svg`, ROEDescriptions[index], () => { getUnitsManager().selectedUnitsSetROE(option); }); }); this.#optionButtons["reactionToThreat"] = reactionsToThreat.map((option: string, index: number) => { - return this.#createOptionButton(option, reactionsToThreatDescriptions[index],() => { getUnitsManager().selectedUnitsSetReactionToThreat(option); }); + return this.#createOptionButton(option, `threat/${option.toLowerCase()}.svg`, reactionsToThreatDescriptions[index],() => { getUnitsManager().selectedUnitsSetReactionToThreat(option); }); }); this.#optionButtons["emissionsCountermeasures"] = emissionsCountermeasures.map((option: string, index: number) => { - return this.#createOptionButton(option, emissionsCountermeasuresDescriptions[index],() => { getUnitsManager().selectedUnitsSetEmissionsCountermeasures(option); }); + return this.#createOptionButton(option, `emissions/${option.toLowerCase()}.svg`, emissionsCountermeasuresDescriptions[index],() => { getUnitsManager().selectedUnitsSetEmissionsCountermeasures(option); }); }); this.getElement().querySelector("#roe-buttons-container")?.append(...this.#optionButtons["ROE"]); @@ -342,10 +342,11 @@ export class UnitControlPanel extends Panel { this.#advancedSettingsDialog.classList.add("hide"); } - #createOptionButton(option: string, title: string, callback: EventListenerOrEventListenerObject) { + #createOptionButton(value: string, url: string, title: string, callback: EventListenerOrEventListenerObject) { var button = document.createElement("button"); - button.value = option; button.title = title; + button.value = value; + button.innerHTML = `` button.addEventListener("click", callback); return button; } diff --git a/client/src/units/unit.ts b/client/src/units/unit.ts index f98dff6e..f6636c44 100644 --- a/client/src/units/unit.ts +++ b/client/src/units/unit.ts @@ -127,7 +127,7 @@ export class Unit extends Marker { getMarkerHTML() { return `
-
+
` } @@ -539,15 +539,6 @@ export class Unit extends Marker { var element = this.getElement(); if (element != null) { - /* Set the element styling */ - const unitMarker = element.querySelector(".unit-marker") as HTMLElement; - - const styles = getComputedStyle(document.documentElement); - const primaryBlue = styles.getPropertyValue('--primary-blue'); - - if (unitMarker) - unitMarker.style.backgroundImage = `url("/resources/theme/images/units/aircraft.svg?background-colour=${primaryBlue}")`; - /* Draw the velocity vector */ element.querySelector(".unit-vvi")?.setAttribute("style", `height: ${15 + this.getFlightData().speed / 5}px;`); @@ -703,14 +694,10 @@ export class Aircraft extends AirUnit { getMarkerHTML() { return `
-
-
-
-
-
-
+
+
${aircraftDatabase.getByName(this.getBaseData().name)?.shortLabel || ""}
@@ -752,8 +739,7 @@ export class GroundUnit extends Unit { getMarkerHTML() { var role = groundUnitsDatabase.getByName(this.getBaseData().name)?.loadouts[0].roles[0]; return `
-
-
+
${role?.substring(0, 1)?.toUpperCase() || ""}
@@ -764,7 +750,7 @@ export class GroundUnit extends Unit { getMarkerCategory() { // TODO this is very messy var role = groundUnitsDatabase.getByName(this.getBaseData().name)?.loadouts[0].roles[0]; - var markerCategory = (role === "SAM") ? "sam" : "groundunit"; + var markerCategory = (role === "SAM") ? "sam" : "other"; return markerCategory; } } @@ -787,8 +773,7 @@ export class Weapon extends Unit { getMarkerHTML(): string { return `
-
-
+
` } diff --git a/client/views/index.ejs b/client/views/index.ejs index 80ac37c0..fe565ac0 100644 --- a/client/views/index.ejs +++ b/client/views/index.ejs @@ -5,6 +5,7 @@ + @@ -22,6 +23,7 @@
+ <%- include('aic.ejs') %> <%- include('atc.ejs') %> <%- include('contextmenus.ejs') %> diff --git a/client/views/navbar.ejs b/client/views/navbar.ejs index 045aeafb..4c46723c 100644 --- a/client/views/navbar.ejs +++ b/client/views/navbar.ejs @@ -1,9 +1,8 @@ \ No newline at end of file diff --git a/client/views/uikit.ejs b/client/views/uikit.ejs index e26d2eb9..9bcc7e2c 100644 --- a/client/views/uikit.ejs +++ b/client/views/uikit.ejs @@ -170,7 +170,7 @@
Neutral
-
+
Z
@@ -182,7 +182,7 @@
Blue
-
+
Y
@@ -194,7 +194,7 @@
Red
-
+
X
@@ -216,7 +216,7 @@
Neutral
-
+
Z
@@ -228,7 +228,7 @@
Blue
-
+
Y
@@ -240,7 +240,7 @@
Red
-
+
X