diff --git a/background.js b/background.js index 81b087d8e9..39408cd2a2 100644 --- a/background.js +++ b/background.js @@ -4,9 +4,9 @@ function start_app() { frame: 'none', resizable: false, minWidth: 962, - minHeight: 729, + minHeight: 650, maxWidth: 962, - maxHeight: 729 + maxHeight: 650 }, function(window_child) { window_child.onClosed.addListener(function() { // connectionId is passed from the script side through the chrome.runtime.getBackgroundPage refference diff --git a/css/style.css b/css/style.css index 60e51227ac..d4733b0c86 100644 --- a/css/style.css +++ b/css/style.css @@ -197,7 +197,7 @@ input[type="number"]::-webkit-inner-spin-button { #log { margin-bottom: 10px; - height: 90px; + height: 60px; border: 1px solid silver; background-color: white; @@ -256,7 +256,7 @@ input[type="number"]::-webkit-inner-spin-button { padding: 10px; background-color: white; - height: 480px; + height: 429px; overflow-x: hidden; overflow-y: auto; diff --git a/js/serial_backend.js b/js/serial_backend.js index 8a1d67c509..0072c565f5 100644 --- a/js/serial_backend.js +++ b/js/serial_backend.js @@ -134,7 +134,7 @@ function onOpen(openInfo) { // disconnect after 10 seconds with error if we don't get IDENT data GUI.timeout_add('connecting', function() { if (!configuration_received) { - GUI.log('Did not received configuration within 10 seconds, communication failed - Disconnecting'); + GUI.log('No configuration received within 10 seconds, communication failed - Disconnecting'); $('div#port-picker a.connect').click(); // disconnect } diff --git a/tabs/cli.css b/tabs/cli.css index b5d1fc31f4..7e79ae14ec 100644 --- a/tabs/cli.css +++ b/tabs/cli.css @@ -6,7 +6,7 @@ } .tab-cli .window { margin-top: 10px; - height: 400px; + height: 350px; padding: 5px; diff --git a/tabs/initial_setup.css b/tabs/initial_setup.css index 7ed1fe4085..a941bf70ec 100644 --- a/tabs/initial_setup.css +++ b/tabs/initial_setup.css @@ -46,7 +46,7 @@ #interactive_block { float: left; - height: 300px; + height: 280px; width: 400px; border: 1px solid silver; @@ -63,7 +63,7 @@ display: block; margin-left: 10px; - margin-top: 235px; + margin-top: 215px; height: 28px; line-height: 28px; @@ -315,10 +315,11 @@ border: 1px solid #43c84d; } .tab-initial_setup .compass-wrapper { + display: none; position: absolute; - bottom: 25px; - right: 85px; + bottom: 10px; + right: 10px; border: 1px solid silver; border-radius: 50%; diff --git a/tabs/initial_setup.js b/tabs/initial_setup.js index 4d30d76015..b9e955b130 100644 --- a/tabs/initial_setup.js +++ b/tabs/initial_setup.js @@ -219,9 +219,11 @@ function tab_initialize_initial_setup() { $('#cubePITCH', cube).css('-webkit-transform', 'rotateX(' + SENSOR_DATA.kinematicsY + 'deg)'); $('#cubeROLL', cube).css('-webkit-transform', 'rotateZ(' + SENSOR_DATA.kinematicsX + 'deg)'); + /* // Update Compass $('div#compass .pointer').css('-webkit-transform', 'rotate(' + (SENSOR_DATA.kinematicsZ) + 'deg)'); $('div#compass .value').html(SENSOR_DATA.kinematicsZ + '°'); + */ }); }); }); diff --git a/tabs/motor_outputs.css b/tabs/motor_outputs.css index 0113303c10..c0688b5383 100644 --- a/tabs/motor_outputs.css +++ b/tabs/motor_outputs.css @@ -20,7 +20,7 @@ float: left; width: 40px; - height: 220px; + height: 150px; margin-right: 10px; @@ -29,10 +29,8 @@ } .tab-motor_outputs .indicator { position: absolute; - margin-top: 330px; width: 40px; - height: 0px; } .tab-motor_outputs p { margin-top: 20px; @@ -64,7 +62,7 @@ .tab-motor_outputs .motor_testing .notice { float: right; - width: 440px; + width: 420px; margin-top: 20px; padding: 5px; diff --git a/tabs/motor_outputs.js b/tabs/motor_outputs.js index 2b119f2559..7d5f2df5d0 100644 --- a/tabs/motor_outputs.js +++ b/tabs/motor_outputs.js @@ -83,16 +83,16 @@ function tab_initialize_motor_outputs() { // Update UI for (var i = 0; i < MOTOR_DATA.length; i++) { MOTOR_DATA[i] -= 1000; - var margin_top = 220.0 - (MOTOR_DATA[i] * 0.22); - var height = (MOTOR_DATA[i] * 0.22); + var margin_top = 150.0 - (MOTOR_DATA[i] * 0.15); + var height = (MOTOR_DATA[i] * 0.15); 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)'}); } for (var i = 0; i < SERVO_DATA.length; i++) { SERVO_DATA[i] -= 1000; - var margin_top = 220.0 - (SERVO_DATA[i] * 0.22); - var height = (SERVO_DATA[i] * 0.22); + var margin_top = 150.0 - (SERVO_DATA[i] * 0.15); + var height = (SERVO_DATA[i] * 0.15); 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)'}); } diff --git a/tabs/receiver.css b/tabs/receiver.css index 2b3805e2ce..97aad36d9a 100644 --- a/tabs/receiver.css +++ b/tabs/receiver.css @@ -63,7 +63,7 @@ margin-top: 20px; width: 880px; - height: 250px; + height: 200px; } .tab-receiver .curves { float: right;