Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-26 09:45:23 +03:00
Code Wiki Activity

Merge remote-tracking branch 'iNavFlight/master' into magnetometer_tab_improvments

Browse source 
# Conflicts:
#	_locales/en/messages.json
This commit is contained in:
Luca 2022-03-26 15:50:02 +01:00
commit ce0b4dac66
72 changed files with 2879 additions and 2488 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/css/dropdown-lists/css/style_lists.css
View file

@ -112,7 +112,7 @@
}
.dropdown-dark {
background: #636363; /* NEW2 */
background: #636363; /* NEW2 */
background: #3e403f; /* NEW */
border-color: #111 #0a0a0a black;
@ -123,11 +123,7 @@
-webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px rgba(0, 0, 0, 0.2);
color:#a6a6a6;
text-shadow:0px 1px rgba(0, 0, 0, 0.25);
text-shadow:0px 1px rgba(0, 0, 0, 0.25);
}
.dropdown-dark:before {
border-bottom-color: #aaa;
@ -143,9 +139,17 @@
}
.dropdown-dark .dropdown-select:focus {
color: #fff;
color: #fff !important;
}
.dropdown-dark .dropdown-select > option {
background: #56ab1a;
text-shadow: 0 1px rgba(0, 0, 0, 0.4);
}
.dropdown-dark #profilechange.showProfileParams {
color: #d5ebfe;
}
.dropdown-dark #batteryprofilechange.showProfileParams {
color: #fef2d5;
}

7
src/css/tabs/advanced_tuning.css
View file

@ -0,0 +1,7 @@
.tab-advanced-tuning .config-section select, .tab-advanced-tuning .spacer_box div input {
margin-right: 0 !important;
}
.tab-advanced-tuning .config-section .checkbox .switchery {
margin-right: 63px !important;
}

41
src/css/tabs/configuration.css
View file

@ -28,19 +28,19 @@
text-align: left;
border: 1px solid silver;
border-radius: 3px;
margin-right: 11px;
font-size: 12px;
font-weight: normal;
}
.config-section .number input,
.config-section .checkbox input,
.tab-configuration .number input {
width: 106px;
}
.config-section .string input,
.tab-configuration .string input {
width: 130px;
width: 106px;
}
.tab-configuration .disabled {
@ -49,7 +49,7 @@
.config-section input,
.tab-configuration input {
float: left;
/*float: left;*/
}
.config-section .spacer_box,
@ -138,9 +138,7 @@ hr {
}
.tab-configuration .mixerPreview img {
width: 90%;
height: 90%;
padding: 5%;
width: 175px;
}
.tab-configuration .gui_box {
@ -185,6 +183,12 @@ hr {
width: 110px;
}
.tab-configuration #magalign {
width: 111px;
height: 22px;
margin-right: 4px;
}
@media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {
.tab-configuration .gui_box span {
line-height: 17px;
@ -211,7 +215,12 @@ hr {
.config-section .radio,
.config-section .number {
position: relative;
height: 22px;
min-height: 22px;
}
.config-section .select select,
.config-section .number input {
vertical-align: top;
}
.config-section .checkbox label,
@ -220,8 +229,8 @@ hr {
}
.config-section label {
position: absolute;
left: 118px;
display: inline-block;
width: calc(100% - 162px);
}
.config-section .radio label {
@ -243,9 +252,21 @@ hr {
}
.config-section select {
width: 110px;
width: 111px;
height: 22px;
margin-right: 4px;
}
.config-section .helpicon {
margin-top: 3px;
}
.config-section .unit_wrapper {
vertical-align: top;
}
.config-section .checkbox .switchery {
margin-right: 72px;
vertical-align: top;
margin-top: 3px;
}

11
src/css/tabs/failsafe.css
View file

@ -26,7 +26,6 @@
text-align: left;
border: 1px solid silver;
border-radius: 3px;
margin-right: 11px;
font-size: 12px;
font-weight: normal;
}
@ -253,10 +252,12 @@
height: 90px;
}
.tab-failsafe .minimumDistance {
width: 100px !important;
padding-left: 3px;
margin-right: 11px;
.tab-failsafe input {
width: 75px !important;
}
.tab-failsafe select {
width: 79px;
}
@media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {

1
src/css/tabs/firmware_flasher.css
View file

@ -271,7 +271,6 @@
text-align: left;
border: 1px solid silver;
border-radius: 3px;
margin-right: 11px;
margin-bottom: 5px;
font-size: 12px;
font-weight: normal;

4
src/css/tabs/gps.css
View file

@ -113,6 +113,10 @@
border-top-right-radius: 0;
}
.tab-gps .config-section .checkbox .switchery {
margin-right: 68px;
}
#gps-map {
height: 400px;
width: 100%;

7
src/css/tabs/led_strip.css
View file

@ -74,6 +74,12 @@
border-color: rgb(52, 155, 255);
}
.tab-led-strip .gPoint.function-h { /* Channel */
background: skyblue;
box-shadow: inset 0 0 30px rgba(0, 0, 0, .7);
border-color: black;
}
.tab-led-strip .gPoint.function-c .overlay-color,
.tab-led-strip .gPoint.function-r .overlay-color {
float: left;
@ -210,6 +216,7 @@
.tab-led-strip .select .function-g { background: green;}
/* .tab-led-strip .select .function-b { background: white; color:black;} */
.tab-led-strip .select .function-r { background: #acacac;}
.tab-led-strip .select .function-h { background: skyblue;}
.tab-led-strip .select .functionSelect option {
background: white;

23
src/css/tabs/mixer.css
View file

@ -2,6 +2,8 @@
position: absolute;
right: 0;
bottom: 1em;
margin-left: 185px;
width: calc(100% - 175px);
}
.mixer-load-button > div {
@ -95,4 +97,25 @@
.mixer-fixed-value-col {
display: none;
}
#needToUpdateMixerMessage {
margin-bottom: 5px;
}
.outputImageNumber {
position: absolute;
background-color: #FFF;
font-family: 'open_sansbold', Arial, serif;
width: 18px;
height: 18px;
border: 2.5px solid #ff00ff;
border-radius: 4px;
}
.outputImageNumber.isMotor {
width: 29px;
height: 29px;
line-height: 27px;
border-radius: 20px;
}

10
src/css/tabs/motors.css
View file

@ -455,4 +455,12 @@
.tab-servos .short {
width: 32px;
}
}
.tab-motors .config-section .checkbox .switchery {
margin-right: 68px;
}
.tab-motors .config-section .number input {
margin-right: 4px;
}

10
src/css/tabs/onboard_logging.css
View file

@ -295,4 +295,14 @@
pointer-events: none;
text-shadow: none;
opacity: 0.5;
}
.tab-onboard_logging .leftWrapper {
float: left;
width: calc(50% - 20px);
}
.tab-onboard_logging .rightWrapper {
float: right;
width: calc(50%);
}

21
src/css/tabs/osd.css
View file

@ -477,25 +477,23 @@ button {
}
.tab-osd .settings input {
width: 55px;
width: 75px;
padding-left: 3px;
height: 18px;
line-height: 20px;
text-align: left;
border: 1px solid silver;
border-radius: 3px;
margin-right: 11px;
font-size: 11px;
font-weight: normal;
}
.tab-osd .settings select {
width: 75px;
margin-right: 11px;
width: 80px;
}
.tab-osd .settings .switchery {
margin-right: 25px;
margin-right: 33px;
}
.tab-osd .settings .djiCraftNameElements {
@ -531,4 +529,17 @@ button {
float: right;
width: auto !important;
margin-right: 0 !important;
}
.tab-osd label > .i18n-replaced {
display: inline-block;
left: 108px;
width: calc(100% - 110px);
}
.tab-osd .settings select,
.tab-osd .settings input,
.tab-osd .osd_settings .switchery,
.tab-osd .unit_wrapper {
vertical-align: top;
}

28
src/css/tabs/pid_tuning.css
View file

@ -1,11 +1,14 @@
.rate-tpa_input {
margin: 4px;
width: 5em;
width: 150px;
height: 20px;
line-height: 20px;
border: 1px solid silver;
border-radius: 3px;
padding-left: 3px;
text-align: left;
font-size: 12px;
font-weight: normal;
display: inline-block;
line-height: 20px;
text-align: right;
}
.settings-table.settings-table--inav td,
@ -75,6 +78,16 @@
border-top-right-radius: 5px;
}
.settings-table tr:last-child th {
border-bottom-left-radius: 5px;
border-bottom: none;
}
.settings-table tr:last-child td {
border-bottom-right-radius: 5px;
border-bottom: none;
}
.settings-table {
/*border: 0px solid #ccc; */
margin-bottom: 10px;
@ -294,6 +307,12 @@
border-bottom: 0;
}
.tab-pid_tuning .pidTuning_number {
clear: left;
padding: 4px;
float: left;
}
.tab-pid_tuning .number input {
width: 50px;
padding-left: 3px;
@ -302,7 +321,6 @@
text-align: left;
border: 1px solid silver;
border-radius: 3px;
margin-right: 11px;
font-weight: normal;
}

75
src/css/tabs/transponder.css
View file

@ -1,75 +0,0 @@
.tab-transponder .spacer_box {
padding-bottom: 10px;
float: left;
width: calc(100% - 20px);
}
.tab-transponder .text input {
width: 100px;
padding-left: 3px;
height: 20px;
line-height: 20px;
text-align: left;
border: 1px solid silver;
border-radius: 3px;
margin-right: 11px;
font-size: 12px;
font-weight: normal;
}
.tab-transponder .text .disabled {
width: 43px;
padding: 0 5px;
background-color: #ececec;
}
.tab-transponder .text span {
margin-left: 0;
}
.tab-transponder input {
float: left;
}
.tab-transponder span {
margin: 0;
}
.tab-transponder .text
{
margin-bottom: 5px;
clear: left;
padding-bottom: 5px;
border-bottom: 1px solid #ddd;
width: 100%;
float: left;
}
.tab-transponder .text:last-child {
border-bottom: none;
padding-bottom: 0;
margin-bottom: 0;
}
.tab-transponder .textspacer {
float: left;
width: 115px;
height: 21px;
}
.tab-transponder .gui_box span {
font-style: normal;
font-family: 'open_sansregular', Arial,serif;
line-height: 19px;
color: #4F4F4F;
font-size: 11px;
}
.require-transponder-supported,
.tab-transponder.transponder-supported .require-transponder-unsupported {
display: none;
}
.tab-transponder.transponder-supported .require-transponder-supported {
display: block;
}