Merge branch 'main' into 73-add-tankers-and-awacs-spawning

This commit is contained in:
Pax1601
2023-04-19 16:35:37 +02:00
22 changed files with 972 additions and 464 deletions

View File

@@ -1,211 +1,114 @@
/*** Control panel ***/
#atc-control-panel {
align-self: flex-end;
background: white;
border-radius: 10px;
display:flex;
margin: 0 0 50px 100px;
padding:5px;
position: absolute;
z-index: 9999;
}
.atc-tool {
align-self: center;
border-radius: 10px;
display:none;
justify-self: center;
padding: 10px;
position: absolute;
z-index: 9999;
}
.atc-enabled .atc-tool {
display:flex;
}
#atc-flight-list {
flex-direction: column;
}
#atc-flight-list table {
color:white;
}
#atc-flight-list table td {
padding:0 10px;
text-align: center;
}
#atc-flight-list table td:first-of-type {
text-align: left;
}
#atc-flight-list table tr[data-status='checkedIn'] td {
background-color:goldenrod;
}
#atc-flight-list table tr[data-status='readyToTaxi'] td {
background-color:darkgreen;
}
#atc-flight-list table button {
background-color: #666;
border:1px solid white;
color:white;
font-weight: bold;
margin:2px 0;
}
.atc-strip-board {
align-self: center;
display:flex;
justify-self: center;
position: absolute;
z-index: 9999 ;
}
.atc-strip-board-header {
display:none;
}
.atc-strip-board-strips {
.ol-strip-board-strips {
display:flex;
flex-direction: column;
row-gap: 4px;
}
.atc-strip-board-strip {
display:flex;
flex-direction: row;
}
/*
.atc-strip-board-header {
background:black;
color:white;
display:none;
justify-content: right;
}
.atc-strip-board {
display:flex;
flex-direction: column;
row-gap: 5px;
}
.atc-strip-board-strips {
display:flex;
flex-direction: column;
padding:10px;
row-gap: 5px;
}
.atc-strip-board-strips > div {
.ol-strip-board-strip {
align-items: center;
border-radius: var( --border-radius-sm );
column-gap: 4px;
display:flex;
flex-flow: row nowrap;
row-gap:4px;
}
.ol-strip-board-strip[data-flight-status="checkedin"] {
background-color: #ffffff2A;
}
.ol-strip-board-strip[data-flight-status="readytotaxi"] {
background-color: #ffff0063;
}
.ol-strip-board-strip[data-flight-status="clearedtotaxi"] {
background-color: #00ff0030;
}
.ol-strip-board-strip[data-flight-status="halted"] {
background-color: #FF000040;
}
.ol-strip-board-strip[data-flight-status="terminated"] {
background-color: black;
}
.ol-strip-board-headers {
column-gap: 4px;
display:flex;
flex-flow:row nowrap;
text-align: center;
}
.ol-strip-board-headers > *, .ol-strip-board-strip > * {
padding: 4px;
text-overflow: ellipsis;
white-space: nowrap;
width:80px;
}
.ol-strip-board-strip input[type="text"] {
appearance: none;
background-color: transparent;
border:1px solid #ffffff30;
border-radius: var( --border-radius-sm );
color:white;
column-gap: 2px;
display: flex;
flex-direction: row;
padding: 5px;
}
.atc-strip-board-header > div, .atc-strip-board-strips > div > div {
text-align: center;
width: 75px;
}
.atc-strip-board-header > .name {
width:150px;
}
.atc-strip-board-header > div, .atc-strip-board-strips > div > div {
text-align: center;
width: 75px;
}
.atc-strip-board-strips > div > .name {
text-align: left;
width:150px;
}
.atc-strip-board-strips > div {
align-items: center;
column-gap: 5px;
display: flex;
flex-direction: row;
font-size:12px;
font-weight: 600;
padding: 5px;
row-gap: 5px;
}
/*
.atc-strip-board-header, .atc-strip-board-strips > div {
align-items: center;
background:#FFF3;
color:white;
column-gap: 5px;
display: flex;
flex-direction: row;
font-size:12px;
font-weight: 600;
padding: 5px;
row-gap: 5px;
}
.atc-strip-board-header {
background:black;
color:white;
display:none;
justify-content: right;
}
.atc-strip-board-strips > div {
border-bottom:1px solid black;
}
.atc-strip-board-header > div, .atc-strip-board-strips > div > div {
font-weight:normal;
outline:none;
padding: 4px 0;
text-align: center;
width: 75px;
width:100%;
}
.atc-strip-board-header > .name {
width:150px;
.ol-strip-board-strip[data-time-warning="level-1"] [data-point="timeToGo"] {
border:1px solid #cc0000;
}
.atc-strip-board-strips > div > .handle {
background: black;
border-radius: 50%;
cursor:grab;
height:10px;
width:10px;
.ol-strip-board-headers :nth-child(1),
.ol-strip-board-headers :nth-child(2),
.ol-strip-board-strip :nth-child(1),
.ol-strip-board-strip :nth-child(2) {
width:120px;
}
.atc-strip-board-strips > div > .name {
text-align: left;
width:150px;
.ol-strip-board-strip :nth-child(4) {
text-align: center;
}
.atc-strip-board-strips > div > .warning {
background:red;
color: white;
font-weight: bold;
.ol-strip-board-strip > [data-point="name"] {
text-overflow: ellipsis;
overflow:hidden;
}
.atc-strip-board-strips > div > .link-warning {
border: 1px solid red;
color: red;
font-weight: bold;
.ol-strip-board-strip .ol-select-value {
opacity: .85;
}
*/
.ol-strip-board-add-flight {
display:flex;
flex-flow: row nowrap;
}
.ol-strip-board-add-flight > * {
border:none;
outline: none;
padding:4px 8px;
}
.ol-strip-board-add-flight button {
background-color: darkgreen;
border-bottom-right-radius: var( --border-radius-sm );
border-bottom-left-radius: 0;
border-top-left-radius: 0;
border-top-right-radius: var( --border-radius-sm );
}
.ol-strip-board-add-flight input {
border-bottom-left-radius: var( --border-radius-sm );
border-top-left-radius: var( --border-radius-sm );
}

View File

@@ -6,6 +6,8 @@
}
#primary-toolbar {
align-items: center;
display:flex;
position: absolute;
left: 10px;
top: 10px;
@@ -114,8 +116,8 @@ dl.ol-data-grid dd {
font-size: 16px;
font-weight: var(--font-weight-bolder);
position: absolute;
right: 25px;
top: 25px;
right: 20px;
top: 10px;
}
.ol-dialog-close::before {
@@ -127,6 +129,10 @@ dl.ol-data-grid dd {
padding-bottom: 10px;
}
.ol-dialog-content {
margin:4px 0;
}
.ol-dialog-footer {
border-top: 1px solid var(--background-grey);
padding-top: 15px;

View File

@@ -1,5 +1,6 @@
@import url("layout.css");
@import url("airbase.css");
@import url("atc.css");
@import url("connectionstatuspanel.css");
@import url("contextmenus.css");
@import url("mouseinfopanel.css");
@@ -144,14 +145,17 @@ form > div {
align-items: center;
background-color: var(--background-grey);
border-radius: var(--border-radius-sm);
padding: 1em;
padding: 1em 30px 1em 20px;
width: 100%;
padding-left: 20px;
padding-right: 30px;
overflow: hidden;
text-overflow: ellipsis;
}
.ol-select.narrow:not(.ol-select-image)>.ol-select-value {
opacity: .9;
padding:6px 30px 6px 15px;
}
.ol-select:not(.ol-select-image)>.ol-select-value svg {
margin-right: 10px;
}
@@ -177,7 +181,7 @@ form > div {
.ol-select.is-open > .ol-select-options {
max-height: fit-content;
max-height: 382px;
overflow: visible;
overflow-y: auto;
padding: 8px 0;
@@ -198,7 +202,7 @@ form > div {
box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25);
display: flex;
justify-content: left;
padding: 6px 25px;
padding: 4px 25px;
width: 100%;
}
@@ -355,6 +359,11 @@ nav.ol-panel> :last-child {
align-items: center;
}
.ol-group-header {
text-align: center;
width: 100%;
}
.ol-panel .ol-group.wrap {
flex-wrap: wrap;
}
@@ -552,30 +561,6 @@ nav.ol-panel> :last-child {
width: 28px;
}
#unit-selection #unit-identification [data-object|="unit"] .unit-short-label {
font-size: 12px;
}
#unit-selection #unit-identification #unit-name {
background-color: transparent;
border: none;
color: white;
font-size: 16px;
font-weight: var(--font-weight-bolder);
outline: none;
overflow: hidden;
white-space: nowrap;
width: 150px;
}
#edit-unit-name {
background-image: url("/images/buttons/edit.svg");
background-repeat: no-repeat;
height: 14px;
margin-left: 10px;
width: 15px;
}
#unit-visibility-control {
align-items: center;
}
@@ -626,6 +611,18 @@ body[data-hide-navyunit] #unit-visibility-control-navyunit {
background-image: var(--visibility-control-navyunit-hidden-url);
}
#atc-navbar-control {
align-items: center;
display:flex;
flex-direction: column;
}
#atc-navbar-control button {
background:#ffffff20;
border-radius: var( --border-radius-sm );
padding:4px;
}
.toggle {
--width: 40px;

View File

@@ -26,19 +26,16 @@
}
#loadout-container {
width:250px;
}
#loadout {
display:flex;
overflow: visible;
}
#loadout-silhouette {
align-items: center;
display:flex;
justify-content: center;
width:55%;
width:100px;
}
#loadout-silhouette::before {
@@ -58,7 +55,6 @@
display:flex;
flex-flow: column nowrap;
row-gap: 8px;
width:45%;
}
@@ -82,11 +78,13 @@
#loadout-items > *::after {
content: attr( data-item );
width:52px;
overflow: hidden;
position:relative;
text-overflow: ellipsis;
width:80px;
}
#fuel-percentage {
align-items: center;
display:flex;
@@ -112,7 +110,6 @@
height:6px;
margin-top:4px;
overflow: hidden;
width:90%;
}
#fuel-display #fuel-bar {