From dedf8ab08f4b67bddce200f7a09949a6de3aa3b9 Mon Sep 17 00:00:00 2001 From: PeekabooSteam Date: Mon, 13 Mar 2023 11:43:50 +0000 Subject: [PATCH] Added aircraft selected states. --- client/public/stylesheets/olympus.css | 20 -------------------- client/public/stylesheets/units.css | 24 ++++++++++++++++-------- client/public/themes/olympus/olympus.css | 3 +++ 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css index eb323f3b..fd79a10c 100644 --- a/client/public/stylesheets/olympus.css +++ b/client/public/stylesheets/olympus.css @@ -442,26 +442,6 @@ nav.ol-panel> :last-child { flex-direction: column; } -.data-row { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - column-gap: 2px; -} - -.data-row>*:nth-child(2) { - width: 100px; -} - -.data-row>*:last-child { - width: 30px; - text-align: right; -} - -.data-row>.icon-small { - margin: 2px; -} .slider-container { width: 100%; diff --git a/client/public/stylesheets/units.css b/client/public/stylesheets/units.css index 8a188acd..49833165 100644 --- a/client/public/stylesheets/units.css +++ b/client/public/stylesheets/units.css @@ -53,6 +53,7 @@ padding-bottom: calc( ( var( --unit-air-width ) / 2 ) + var( --unit-stroke-width ) ); position:absolute; width: var( --unit-air-vvi-width ); + z-index: 3; } @@ -117,28 +118,40 @@ width: var( --unit-air-marker-width ); } -[data-object|="unit-air"]:hover .unit-marker, [data-object|="unit-air"][data-is-selected] .unit-marker { +[data-object|="unit-air"]:hover .unit-marker { background-image: var( --unit-air-marker-neutral-hover-url ); } +[data-object|="unit-air"][data-is-selected] .unit-marker { + background-image: var( --unit-air-marker-neutral-selected-url ); +} + [data-object|="unit-air"][data-coalition="blue"] .unit-marker { background-image: var( --unit-air-marker-blue-url ); } -[data-object|="unit-air"][data-coalition="blue"]:hover .unit-marker, [data-object|="unit-air"][data-coalition="blue"][data-is-selected] .unit-marker { +[data-object|="unit-air"][data-coalition="blue"]:hover .unit-marker { background-image: var( --unit-air-marker-blue-hover-url ); } +[data-object|="unit-air"][data-coalition="blue"][data-is-selected] .unit-marker { + background-image: var( --unit-air-marker-blue-selected-url ); +} + [data-object|="unit-air"][data-coalition="red"] .unit-marker { background-image: var( --unit-air-marker-red-url ); } -[data-object|="unit-air"][data-coalition="red"]:hover .unit-marker, [data-object|="unit-air"][data-coalition="red"][data-is-selected] .unit-marker { +[data-object|="unit-air"][data-coalition="red"]:hover .unit-marker { background-image: var( --unit-air-marker-red-hover-url ); } +[data-object|="unit-air"][data-coalition="red"][data-is-selected] .unit-marker { + background-image: var( --unit-air-marker-red-selected-url ); +} + @@ -413,11 +426,6 @@ } -[data-object|="unit"][data-is-selected] rect.unit-marker { - fill:white; -} - - [data-object|="unit"] .unit-status { background-repeat: no-repeat; position:absolute; diff --git a/client/public/themes/olympus/olympus.css b/client/public/themes/olympus/olympus.css index f03e141d..06050adb 100644 --- a/client/public/themes/olympus/olympus.css +++ b/client/public/themes/olympus/olympus.css @@ -101,14 +101,17 @@ --unit-air-marker-blue-url: url( "/themes/olympus/images/icon_aircraft_blue.svg" ); --unit-air-marker-blue-hover-url: url( "/themes/olympus/images/icon_aircraft_blue_hover.svg" ); + --unit-air-marker-blue-selected-url: url( "/themes/olympus/images/icon_aircraft_blue_selected.svg" ); --unit-air-marker-blue-dead-url: url( "/themes/olympus/images/icon_death_blue.svg" ); --unit-air-marker-neutral-url: url( "/themes/olympus/images/icon_aircraft_neutral.svg" ); --unit-air-marker-neutral-hover-url: url( "/themes/olympus/images/icon_aircraft_neutral_hover.svg" ); + --unit-air-marker-neutral-selected-url: url( "/themes/olympus/images/icon_aircraft_neutral_selected.svg" ); --unit-air-marker-neutral-dead-url: url( "/themes/olympus/images/icon_death_neutral.svg" ); --unit-air-marker-red-url: url( "/themes/olympus/images/icon_aircraft_red.svg" ); --unit-air-marker-red-hover-url: url( "/themes/olympus/images/icon_aircraft_red_hover.svg" ); + --unit-air-marker-red-selected-url: url( "/themes/olympus/images/icon_aircraft_red_selected.svg" ); --unit-air-marker-red-dead-url: url( "/themes/olympus/images/icon_death_red.svg" );