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

Merge confilcts resolution

Browse Source
This commit is contained in:
Pax1601 2023-03-12 17:38:11 +01:00
parent f00ac8d974
commit e043f85c47
2 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/public/stylesheets/olympus.css
View File

@ -533,34 +533,34 @@ nav.ol-panel> :last-child {
#unit-control-panel {
#unit-selection {
display: flex;
flex-direction: column;
}
#unit-control-panel #unit-identification {
#unit-selection #unit-identification {
align-items: center;
display: flex;
margin-bottom: 11px;
}
#unit-control-panel #unit-identification [data-object|="unit"] {
#unit-selection #unit-identification [data-object|="unit"] {
height: 28px;
margin-right: 6px;
width: 28px;
}
#unit-control-panel #unit-identification [data-object|="unit"] .unit-marker {
#unit-selection #unit-identification [data-object|="unit"] .unit-marker {
background-size: 28px 28px;
height: 28px;
width: 28px;
}
#unit-control-panel #unit-identification [data-object|="unit"] .unit-short-label {
#unit-selection #unit-identification [data-object|="unit"] .unit-short-label {
font-size: 12px;
}
#unit-control-panel #unit-identification #unit-name {
#unit-selection #unit-identification #unit-name {
background-color: transparent;
border: none;
color: white;

33
client/views/unitcontrolpanel.ejs
View File

@ -1,6 +1,6 @@
<div id="unit-control-panel" class="ol-panel ol-panel-padding-lg">
<div id="unit-info-panel">
<div id="unit-selection">
<div id="unit-identification">
<div data-object="unit-air-aircraft">
@ -13,36 +13,18 @@
<!-- <button id="edit-unit-name" data-on-click="editUnitName"></button> -->
</div>
<div class="ol-group">
<div id="name" class="pill highlight-primary">Name</div>
<div id="group-name" class="pill highlight-primary">Group</div>
<div id="task" class="pill highlight-primary">Task</div>
</div>
<div id="selected-units-container" class="ol-scroll">
<!-- This is where all the unit selection buttons will be shown-->
</div>
<div id="flight-data">
<h4 id="loadout-label">Flight data</h4>
<dl class="data-grid">
<dt>Heading</dt>
<dd id="heading">123&deg;</dd>
<dt>Speed</dt>
<dd id="ground-speed">323kts</dd>
<dt>Altitude</dt>
<dd id="altitude">27,414ft</dd>
</dl>
<h4>Flight controls</h4>
<div class="slider-container flight-control-slider" id="airspeed-slider">
<dl class="data-grid">
<dt>Speed</dt>
<dd class="flight-control-value" id="value">451kts</dd>
</dl>
<input type="range" min="1" max="600" value="451" class="slider">
<input type="range" min="1" max="100" value="0" class="slider">
</div>
<div class="slider-container flight-control-slider" id="altitude-slider">
@ -50,19 +32,10 @@
<dt>Altitude</dt>
<dd class="flight-control-value" id="value">21,594ft</dd>
</dl>
<input type="range" min="1" max="50000" value="21594" class="slider">
<input type="range" min="1" max="100" value="0" class="slider">
</div>
</div>
<div id="loadout-data" class="panel-section">
<h4 id="loadout-label">Loadout<span id="loadout-fuel-level" data-fuel-level="69"></span></h4>
<div id="loadout-container" class="ol-group">
<div class="pill loadout-item" data-qty="2" data-item="AIM-120B"></div>
<div class="pill loadout-item" data-qty="2" data-item="AIM-9P"></div>
<div class="pill loadout-item" data-qty="100" data-item="AIM-120B"></div>
</div>
</div>
</div>
<!-- <h3>Formation</h3> -->