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 ae72bc19..00000000 Binary files a/client/public/images/unit.png and /dev/null differ diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css index b23a92a8..3a0d7326 100644 --- a/client/public/stylesheets/olympus.css +++ b/client/public/stylesheets/olympus.css @@ -588,46 +588,27 @@ nav.ol-panel> :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