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

adjusting element sizes due to window size change

disabling compass UI
This commit is contained in:
cTn 2014-02-03 09:10:13 +01:00
parent a30569077a
commit 5b130cfc9b
9 changed files with 20 additions and 19 deletions

View file

@ -4,9 +4,9 @@ function start_app() {
frame: 'none', frame: 'none',
resizable: false, resizable: false,
minWidth: 962, minWidth: 962,
minHeight: 729, minHeight: 650,
maxWidth: 962, maxWidth: 962,
maxHeight: 729 maxHeight: 650
}, function(window_child) { }, function(window_child) {
window_child.onClosed.addListener(function() { window_child.onClosed.addListener(function() {
// connectionId is passed from the script side through the chrome.runtime.getBackgroundPage refference // connectionId is passed from the script side through the chrome.runtime.getBackgroundPage refference

View file

@ -197,7 +197,7 @@ input[type="number"]::-webkit-inner-spin-button {
#log { #log {
margin-bottom: 10px; margin-bottom: 10px;
height: 90px; height: 60px;
border: 1px solid silver; border: 1px solid silver;
background-color: white; background-color: white;
@ -256,7 +256,7 @@ input[type="number"]::-webkit-inner-spin-button {
padding: 10px; padding: 10px;
background-color: white; background-color: white;
height: 480px; height: 429px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;

View file

@ -134,7 +134,7 @@ function onOpen(openInfo) {
// disconnect after 10 seconds with error if we don't get IDENT data // disconnect after 10 seconds with error if we don't get IDENT data
GUI.timeout_add('connecting', function() { GUI.timeout_add('connecting', function() {
if (!configuration_received) { if (!configuration_received) {
GUI.log('Did not received configuration within <span style="color: red">10 seconds</span>, communication <span style="color: red">failed</span> - Disconnecting'); GUI.log('No configuration received within <span style="color: red">10 seconds</span>, communication <span style="color: red">failed</span> - Disconnecting');
$('div#port-picker a.connect').click(); // disconnect $('div#port-picker a.connect').click(); // disconnect
} }

View file

@ -6,7 +6,7 @@
} }
.tab-cli .window { .tab-cli .window {
margin-top: 10px; margin-top: 10px;
height: 400px; height: 350px;
padding: 5px; padding: 5px;

View file

@ -46,7 +46,7 @@
#interactive_block { #interactive_block {
float: left; float: left;
height: 300px; height: 280px;
width: 400px; width: 400px;
border: 1px solid silver; border: 1px solid silver;
@ -63,7 +63,7 @@
display: block; display: block;
margin-left: 10px; margin-left: 10px;
margin-top: 235px; margin-top: 215px;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
@ -315,10 +315,11 @@
border: 1px solid #43c84d; border: 1px solid #43c84d;
} }
.tab-initial_setup .compass-wrapper { .tab-initial_setup .compass-wrapper {
display: none;
position: absolute; position: absolute;
bottom: 25px; bottom: 10px;
right: 85px; right: 10px;
border: 1px solid silver; border: 1px solid silver;
border-radius: 50%; border-radius: 50%;

View file

@ -219,9 +219,11 @@ function tab_initialize_initial_setup() {
$('#cubePITCH', cube).css('-webkit-transform', 'rotateX(' + SENSOR_DATA.kinematicsY + 'deg)'); $('#cubePITCH', cube).css('-webkit-transform', 'rotateX(' + SENSOR_DATA.kinematicsY + 'deg)');
$('#cubeROLL', cube).css('-webkit-transform', 'rotateZ(' + SENSOR_DATA.kinematicsX + 'deg)'); $('#cubeROLL', cube).css('-webkit-transform', 'rotateZ(' + SENSOR_DATA.kinematicsX + 'deg)');
/*
// Update Compass // Update Compass
$('div#compass .pointer').css('-webkit-transform', 'rotate(' + (SENSOR_DATA.kinematicsZ) + 'deg)'); $('div#compass .pointer').css('-webkit-transform', 'rotate(' + (SENSOR_DATA.kinematicsZ) + 'deg)');
$('div#compass .value').html(SENSOR_DATA.kinematicsZ + '&deg;'); $('div#compass .value').html(SENSOR_DATA.kinematicsZ + '&deg;');
*/
}); });
}); });
}); });

View file

@ -20,7 +20,7 @@
float: left; float: left;
width: 40px; width: 40px;
height: 220px; height: 150px;
margin-right: 10px; margin-right: 10px;
@ -29,10 +29,8 @@
} }
.tab-motor_outputs .indicator { .tab-motor_outputs .indicator {
position: absolute; position: absolute;
margin-top: 330px;
width: 40px; width: 40px;
height: 0px;
} }
.tab-motor_outputs p { .tab-motor_outputs p {
margin-top: 20px; margin-top: 20px;
@ -64,7 +62,7 @@
.tab-motor_outputs .motor_testing .notice { .tab-motor_outputs .motor_testing .notice {
float: right; float: right;
width: 440px; width: 420px;
margin-top: 20px; margin-top: 20px;
padding: 5px; padding: 5px;

View file

@ -83,16 +83,16 @@ function tab_initialize_motor_outputs() {
// Update UI // Update UI
for (var i = 0; i < MOTOR_DATA.length; i++) { for (var i = 0; i < MOTOR_DATA.length; i++) {
MOTOR_DATA[i] -= 1000; MOTOR_DATA[i] -= 1000;
var margin_top = 220.0 - (MOTOR_DATA[i] * 0.22); var margin_top = 150.0 - (MOTOR_DATA[i] * 0.15);
var height = (MOTOR_DATA[i] * 0.22); var height = (MOTOR_DATA[i] * 0.15);
var color = parseInt(MOTOR_DATA[i] * 0.256); var color = parseInt(MOTOR_DATA[i] * 0.256);
$('.motor-' + i + ' .indicator').css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgb(' + color + ',0,0)'}); $('.motor-' + i + ' .indicator').css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgb(' + color + ',0,0)'});
} }
for (var i = 0; i < SERVO_DATA.length; i++) { for (var i = 0; i < SERVO_DATA.length; i++) {
SERVO_DATA[i] -= 1000; SERVO_DATA[i] -= 1000;
var margin_top = 220.0 - (SERVO_DATA[i] * 0.22); var margin_top = 150.0 - (SERVO_DATA[i] * 0.15);
var height = (SERVO_DATA[i] * 0.22); var height = (SERVO_DATA[i] * 0.15);
var color = parseInt(SERVO_DATA[i] * 0.256); var color = parseInt(SERVO_DATA[i] * 0.256);
$('.servo-' + i + ' .indicator').css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgb(' + color + ',0,0)'}); $('.servo-' + i + ' .indicator').css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgb(' + color + ',0,0)'});
} }

View file

@ -63,7 +63,7 @@
margin-top: 20px; margin-top: 20px;
width: 880px; width: 880px;
height: 250px; height: 200px;
} }
.tab-receiver .curves { .tab-receiver .curves {
float: right; float: right;