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
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;