1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-23 08:15:19 +03:00

Merge branch 'master' into dzikuvx-wizard

This commit is contained in:
Pawel Spychalski (DzikuVx) 2024-03-23 13:23:43 +01:00
commit 341f2bb9d8
3375 changed files with 283533 additions and 275991 deletions

View file

@ -30,7 +30,7 @@
z-index: 2002;
position: absolute;
width: 500px;
height: 485px;
height: 535px;
overflow: none;
top: 0;
bottom: 0;

View file

@ -81,18 +81,22 @@
background-color: #e4e4e4;
border-bottom: 5px solid white;
color: grey;
min-width: 100px;
height: 85px;
width: 130px;
padding: 0px 5px;
}
.tab-auxiliary .mode .info .name {
font-weight: bold;
font-size: 1.0em;
padding-bottom: 5px;
}
.tab-auxiliary .mode .info .buttons {
position: absolute;
bottom: 14px;
width: 100%;
margin-left:-5px;
}
.tab-auxiliary .mode .info .buttons a {

View file

@ -139,13 +139,23 @@
#calib_btn {
margin-top: 5px;
margin-left: 5px;
}
}
#calib_btn a {
height:30px;
padding-top: 20px;
width: calc(100% - 5px);
}
}
#calib_btn a.resetCalibration {
background-color: grey;
color: rgb(212, 212, 212);
}
#calib_btn a.resetCalibration:hover {
background-color: #e60000;
color: #ffffff;
}
.tab-calibration input {
width: 57px;

View file

@ -79,6 +79,24 @@
color: white;
}
.cli-textcomplete-dropdown {
border: 1px solid black;
background-color: #4f4f4f;
border-radius: 5px;
max-height: 50%;
overflow: auto;
list-style: none;
padding: 5px;
margin: 0;
}
.cli-textcomplete-dropdown a {
color: white;
cursor: pointer;
}
.cli-textcomplete-dropdown .active {
background-color: #000000;
}
@media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {
.tab-cli .content_wrapper {

View file

@ -233,6 +233,11 @@ hr {
width: calc(100% - 162px);
}
.config-section--full-width label {
display: block;
width: auto;
}
.config-section .radio label {
left: 2em;
}

32
src/css/tabs/ez_tune.css Normal file
View file

@ -0,0 +1,32 @@
.ez-tune-preview {
background-color: #8ecae6;
margin-left: 1em;
margin-bottom: 1em;
min-width: 25%;
padding: 0.5em;
}
.ez-tune-preview h2 {
font-size: 1.3em;
margin-bottom: 1em;
margin-top: 0.5em;
color: #303030
}
.ez-tune-preview table {
width: 100%;
}
.ez-tune-preview table td,
.ez-tune-preview table th {
padding: 0.5em;
text-align: center;
}
.ez-tune-preview table th {
background-color: #3EA5D4;
}
.ez-tune-preview table td {
background-color: #A8D6EC;
}

View file

@ -49,6 +49,11 @@
-webkit-appearance: none;
}
.tab-firmware_flasher .autoselect_description {
margin-left: 10px;
line-height: 25px;
}
/*noinspection ALL*/
.tab-firmware_flasher .info .progress::-webkit-progress-bar {
background-color: #4f4f4f;

View file

@ -136,8 +136,9 @@
.tab-magnetometer #interactive_block {
position: absolute;
width: calc(100% - 40px);
height: calc(100% - 245px);
width: calc(100% - 655px);
height: 771px;
min-height: calc(100% - 200px);
background-color: #f9f9f9;
border-radius: 5px;
border: 1px solid #e4e4e4;
@ -190,6 +191,17 @@ progress[value]::-webkit-progress-value {
box-shadow: 0 0 3px rgba(0, 0, 0, 0.25) inset;
}
.tab-magnetometer-left-wrapper {
float:left;
width: calc( 100% - 655px );
}
.tab-magnetometer-right-wrapper {
float:right;
width: 600px;
}
@media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {
#magnetometer-map {

View file

@ -522,3 +522,7 @@
.tab-mission-control .valueLegend{
float:right;
}
.tab-mission-control .userActionContainer {
display: inline-block;
}

View file

@ -118,4 +118,14 @@
height: 29px;
line-height: 27px;
border-radius: 20px;
}
}
.motorNumber {
position: absolute;
font-size: 1.4em;
}
.mixer-preview-image-numbers {
width: fit-content;
}

View file

@ -125,6 +125,7 @@
.tab-onboard_logging dialog {
width: 40em;
border-radius: 5px;
height: fit-content;
}
.tab-onboard_logging dialog .buttons {

View file

@ -430,29 +430,206 @@ button {
left: calc(50% - 197px);
}
.tab-osd .preview_hd {
.tab-osd .preview_bfhdcompat {
width: 636px !important; /* 12 X char width */
left: calc(50% - 335px) !important; /* width / 2 + 17 */
}
.tab-osd .hd_bfhdcompat_43_left {
border-left: 2px solid red;
position: absolute;
/*left: 77.5px; // Calculated correct position */
left: 70px;
height: calc(100% - 27px);
}
.tab-osd .hd_bfhdcompat_43_right {
border-right: 2px solid red;
position: absolute;
/* right: 77.5px; // Calculated correct position */
right: 70px;
height: calc(100% - 27px);
}
.tab-osd .preview_bfhdcompat_side {
width: calc(50% - 335px) !important;
}
.tab-osd .preview_avatar {
width: 636px !important; /* 12 X char width */
left: calc(50% - 335px) !important; /* width / 2 + 17 */
}
.tab-osd .hd_avatar_43_left {
border-left: 2px solid red;
position: absolute;
/*left: 77.5px; // Calculated correct position */
left: 30px;
height: calc(100% - 27px);
}
.tab-osd .hd_avatar_43_right {
border-right: 2px solid red;
position: absolute;
/* right: 77.5px; // Calculated correct position */
right: 36px;
height: calc(100% - 27px);
}
.tab-osd .preview_avatar_side {
width: calc(50% - 335px) !important;
}
.tab-osd .preview_hdzero {
width: 600px !important;
left: calc(50% - 317px) !important;
}
.tab-osd .hd_43_left {
border-left: 1px solid red;
.tab-osd .hdzero_43_left {
border-left: 2px solid red;
position: absolute;
left: 60px;
height: calc(100% - 27px);
}
.tab-osd .hd_43_right {
border-right: 1px solid red;
.tab-osd .hdzero_43_right {
border-right: 2px solid red;
position: absolute;
right: 60px;
height: calc(100% - 27px);
}
.tab-osd .preview_hd_side {
.tab-osd .preview_hdzero_side {
width: calc(50% - 317px) !important;
}
.tab-osd .preview_dji_hd {
width: 720px !important;
left: calc(50% - 377px) !important;
}
.tab-osd .dji_hd_43_left {
border-left: 2px solid red;
position: absolute;
left: 84px;
height: calc(100% - 27px);
}
.tab-osd .dji_hd_43_right {
border-right: 2px solid red;
position: absolute;
right: 84px;
height: calc(100% - 27px);
}
.tab-osd .preview_dji_hd_side {
width: calc(50% - 377px) !important;
}
.tab-osd .hd_3016_top {
border-top: 2px solid blue;
position: absolute;
top: 46px;
left: 120px;
width: 360px;
}
.tab-osd .hd_3016_bottom {
border-bottom: 2px solid blue;
position: absolute;
bottom: 18px;
left: 120px;
width: 360px;
}
.tab-osd .hd_3016_left {
border-left: 2px solid blue;
position: absolute;
top: 46px;
left: 120px;
height: 288px;
}
.tab-osd .hd_3016_right {
border-right: 2px solid blue;
position: absolute;
top: 46px;
right: 120px;
height: 288px;
}
.tab-osd .hd_bfhdcompat_bottom {
border: 2px solid purple;
position: absolute;
height: 70px;
bottom: 0px;
left: 450px;
right: 0px;
pointer-events: none;
}
.tab-osd .hd_bfhdcompat_storagebox {
border: 2px solid purple;
position: absolute;
top: 115px;
height: 55px;
right: 0px;
width: 80px;
pointer-events: none;
}
.tab-osd .hd_avatar_bottom {
border-bottom: 2px solid purple;
position: absolute;
bottom: 33px;
left: 0px;
right: 0px;
}
.tab-osd .hd_avatar_storagebox_t {
border-top: 2px solid purple;
position: absolute;
top: 56px;
height: 1px;
right: 34px;
width: 48px;
}
.tab-osd .hd_avatar_storagebox_b {
border-bottom: 2px solid purple;
position: absolute;
top: 88px;
height: 1px;
right: 34px;
width: 48px;
}
.tab-osd .hd_avatar_storagebox_l {
border-left: 2px solid purple;
position: absolute;
top: 56px;
height: 35px;
right: 80px;
width: 1px;
}
.tab-osd .hd_avatar_storagebox_r {
border-right: 2px solid purple;
position: absolute;
top: 56px;
height: 35px;
right: 32px;
width: 1px;
}
.tab-osd .ntsc_bottom {
border-bottom: 2px solid green;
position: absolute;
bottom: 54px;
left: 0px;
width: 100%;
}
.tab-osd .preview {
/* please don't copy the generic background image from another project
* and replace the one that @nathantsoi took :)
@ -538,7 +715,7 @@ button {
}
.tab-osd .settings select,
.tab-osd .settings input,
.tab-osd .settings input,
.tab-osd .osd_settings .switchery,
.tab-osd .unit_wrapper {
vertical-align: top;

View file

@ -313,6 +313,11 @@
float: left;
}
.tab-pid_tuning .pidTuning_select {
clear: left;
padding: 2px 6px 2px 1px;
}
.tab-pid_tuning .number input {
width: 50px;
padding-left: 3px;
@ -396,18 +401,21 @@
/* background: #D6D6D6 linear-gradient(-45deg, rgba(255, 255, 255, .2) 10%, transparent 10%, transparent 20%, rgba(255, 255, 255, .2) 20%, rgba(255, 255, 255, .2) 30%, transparent 30%, transparent 40%, rgba(255, 255, 255, .2) 40%, rgba(255, 255, 255, .2) 50%, transparent 50%, transparent 60%, rgba(255, 255, 255, .2) 60%, rgba(255, 255, 255, .2) 70%, transparent 70%, transparent 80%, rgba(255, 255, 255, .2) 80%, rgba(255, 255, 255, .2) 90%, transparent 90%, transparent 100%, rgba(255, 255, 255, .2) 100%, transparent); */
}
.pid-slider-row {
.pid-slider-row,
.pid-switch-row {
display: flex;
padding: 4px;
}
.pid-slider-row span {
.pid-slider-row span,
.pid-switch-row .label {
margin-right: 2em;
width: 120px;
line-height: 22px;;
}
.pid-slider-row input[type="number"] {
.pid-slider-row input[type="number"],
.pid-switch-row input[type="number"] {
font-family: 'open_sansregular', 'Segoe UI', Tahoma, sans-serif;
background-color: #fff;
border: 1px solid #ccc;
@ -417,7 +425,9 @@
margin-right: 2em;
}
.pid-slider-row input[type="range"] {
.pid-slider-row input[type="range"],
.pid-switch-row input[type="range"]
{
display: block;
flex-grow: 100;
}
@ -431,16 +441,26 @@
padding: 4px;
}
.pid-sliders-axis[data-axis="roll"] {
background-color: #afe4fe;
.pid-sliders-axis[data-axis="roll"],
.pid-sliders-axis[data-axis="0"] {
background-color: #8ecae6;
}
.pid-sliders-axis[data-axis="pitch"] {
background-color: #C4B5FF;
.pid-sliders-axis[data-axis="pitch"],
.pid-sliders-axis[data-axis="1"]
{
background-color: #00b4d8;
}
.pid-sliders-axis[data-axis="yaw"] {
background-color: #E6B6F0;
.pid-sliders-axis[data-axis="yaw"],
.pid-sliders-axis[data-axis="2"]
{
background-color: #e9c46a;
}
.pid-sliders-axis[data-axis="3"]
{
background-color: #f4a261;
}
#pid-sliders {

View file

@ -40,6 +40,21 @@
float: left;
}
.attitude_note1 {
position: absolute;
left: 130px;
top: 29px;
font-size: 10px;
}
.attitude_note2 {
position: absolute;
left: 130px;
top: 13px;
font-size: 10px;
}
#interactive_block a.reset {
position: absolute;
display: block;

86
src/css/tabs/sitl.css Normal file
View file

@ -0,0 +1,86 @@
.tab-sitl input {
width: 111px;
padding-left: 3px;
height: 18px;
line-height: 20px;
text-align: left;
border: 1px solid silver;
border-radius: 3px;
font-size: 11px;
font-weight: normal;
}
.tab-sitl .simIP span {
margin-left: 10px;
}
.map-table td, .map-table th {
padding: 2px;
height: 2.5em;
text-align: center;
}
.tab-sitl .switchery {
margin-right: 68px !important;
}
.map-table thead tr {
border-left: 1px solid #e4e4e4;
border-right: 1px solid #e4e4e4;
background-color: #828885;
color: #FFF;
}
.map-table tr:nth-child(even) td,
.map-table tr:nth-child(even) th {
background-color: #ebe7e7;
}
.sitlNumber {
margin-left: 14px;
}
.map-table {
width: 300px;
}
.tab-sitl .leftWrapper {
float: left;
width: calc(50% - 20px);
}
.tab-sitl .rightWrapper {
float: left;
width: calc(50% - 0px);
margin: 0 0 10px 20px;
}
.sitlProfile_box {
padding: 10px;
margin-bottom: 3px;
float: left;
}
.sitlProfile_select {
float:left;
padding-top: 2px;
padding-right: 10px
}
.default_btn.sitlnarrow {
width: auto;
margin-bottom: 0;
padding-left: 10px;
}
.default_btn.sitlnarrow a {
padding: 5px;
}
#sitlLog {
resize: none;
width: 100%;
height: 100%;
box-sizing: border-box
}