diff --git a/_locales/en/messages.json b/_locales/en/messages.json index dc49f49d..2745f9a8 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -35,7 +35,7 @@ "message": "Device - Rebooting" }, "deviceReady": { - "message": "Device - Ready" + "message": "Device - Ready" }, "backupFileIncompatible": { @@ -125,26 +125,26 @@ }, "serialPortOpened": { - "message": "Serial port successfully opened with ID: $1" + "message": "Serial port successfully opened with ID: $1" }, "serialPortOpenFail": { "message": "Failed to open serial port" }, "serialPortClosedOk": { - "message": "Serial port successfully closed" + "message": "Serial port successfully closed" }, "serialPortClosedFail": { "message": "Failed to close serial port" }, "usbDeviceOpened": { - "message": "USB device successfully opened with ID: $1" + "message": "USB device successfully opened with ID: $1" }, "usbDeviceOpenFail": { "message": "Failed to open USB device!" }, "usbDeviceClosed": { - "message": "USB device successfully closed" + "message": "USB device successfully closed" }, "usbDeviceCloseFail": { "message": "Failed to close USB device" @@ -177,10 +177,10 @@ "message": "Firmware Version: $1" }, "apiVersionReceived": { - "message": "MultiWii API version received - $1" + "message": "MultiWii API version received - $1" }, "uniqueDeviceIdReceived": { - "message": "Unique device ID received - 0x$1" + "message": "Unique device ID received - 0x$1" }, "boardInfoReceived": { "message": "Board: $1, version: $2" @@ -222,7 +222,7 @@ "message": "Please use the Firmware Flasher to access DFU devices" }, "dfu_erased_kilobytes": { - "message": "Erased $1 kB of flash successfully" + "message": "Erased $1 kB of flash successfully" }, "dfu_device_flash_info": { "message": "Detected device with total flash size $1 kiB" @@ -232,21 +232,21 @@ }, "eeprom_saved_ok": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "defaultWelcomeIntro": { - "message": "Welcome to INAVFlight - Configurator, a utility designed to simplify updating, configuring and tuning of your flight controller." + "message": "Welcome to INAV - Configurator, a utility designed to simplify updating, configuring and tuning of your flight controller." }, "defaultWelcomeText": { - "message": "The application supports all hardware that can run INAVFlight (SPRacingF3, Vortex, Sparky, DoDo, CC3D/EVO, Air Hero 32, Flip32/+/Deluxe, DragonFly32, CJMCU Microquad, Chebuzz F3, STM32F3Discovery, Hermit, Naze32 Tricopter Frame, Skyline32, Naze/32/Mini/Pro/Blackbox etc)

The firmware source code can be downloaded from here
The newest binary firmware image is available here, development builds available here

Latest CP210x Drivers can be downloaded from here
Latest STM USB VCP Drivers can be downloaded from here
Latest Zadig for Windows DFU flashing can be downloaded from here
" + "message": "The application supports all hardware that can run INAV (SPRacingF3, Vortex, Sparky, DoDo, CC3D/EVO, Air Hero 32, Flip32/+/Deluxe, DragonFly32, CJMCU Microquad, Chebuzz F3, STM32F3Discovery, Hermit, Naze32 Tricopter Frame, Skyline32, Naze/32/Mini/Pro/Blackbox etc)

The firmware source code can be downloaded from here
The newest binary firmware image is available here, development builds available here

Latest CP210x Drivers can be downloaded from here
Latest STM USB VCP Drivers can be downloaded from here
Latest Zadig for Windows DFU flashing can be downloaded from here
" }, "defaultContributingHead": { "message": "Contributing" }, "defaultContributingText": { - "message": "If you would like to help make INAVFlight even better you can help in many ways, including:
" + "message": "If you would like to help make INAV even better you can help in many ways, including:
" }, "defaultChangelogHead": { "message": "Configurator - Changelog" @@ -258,7 +258,7 @@ "message": "Open Source / Donation Notice" }, "defaultDonateText": { - "message": "This utility is fully open source and is available free of charge to all INAVFlight users.
If you found the INAVFlight or INAVFlight Configurator useful, please consider supporting its development by donating." + "message": "This utility is fully open source and is available free of charge to all INAVF users.
If you found the INAV or INAV Configurator useful, please consider supporting its development by donating." }, "defaultSponsorsHead": { "message": "Sponsors" @@ -304,7 +304,7 @@ }, "initialSetupBackupAndRestoreApiVersion": { - "message": "Backup and restore functionality disabled. You have firmware with API version $1, backup and restore requires $2. Please backup your settings via the CLI, see Cleanflight documentation for procedure." + "message": "Backup and restore functionality disabled. You have firmware with API version $1, backup and restore requires $2. Please backup your settings via the CLI, see Cleanflight documentation for procedure." }, "initialSetupButtonCalibrateAccel": { "message": "Calibrate Accelerometer" @@ -334,10 +334,10 @@ "message": "Backup your configuration in case of an accident, CLI settings are not included - See 'dump' cli command" }, "initialSetupBackupSuccess": { - "message": "Backup saved successfully" + "message": "Backup saved successfully" }, "initialSetupRestoreSuccess": { - "message": "Configuration restored successfully" + "message": "Configuration restored successfully" }, "initialSetupButtonResetZaxis": { "message": "Reset Z axis, offset: 0 deg" @@ -436,19 +436,19 @@ "message": "Accelerometer calibration started" }, "initialSetupAccelCalibEnded": { - "message": "Accelerometer calibration finished" + "message": "Accelerometer calibration finished" }, "initialSetupMagCalibStarted": { "message": "Magnetometer calibration started" }, "initialSetupMagCalibEnded": { - "message": "Magnetometer calibration finished" + "message": "Magnetometer calibration finished" }, "initialSetupSettingsRestored": { "message": "Settings restored to default" }, "initialSetupEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "featureRX_PPM": { @@ -693,7 +693,7 @@ "message": "Serial Receiver Provider" }, "configurationEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "configurationButtonSave": { "message": "Save and Reboot" @@ -746,7 +746,7 @@ }, "pidTuningUpgradeFirmwareToChangePidController": { - "message": "Changing PID controller disabled - you can change it via the CLI. You have firmware with API version $1, but this functionality requires requires $2." + "message": "Changing PID controller disabled - you can change it via the CLI. You have firmware with API version $1, but this functionality requires requires $2." }, "pidTuningName": { "message": "Name" @@ -791,13 +791,13 @@ "message": "PID Controller" }, "pidTuningLoadedProfile": { - "message": "Loaded Profile: $1" + "message": "Loaded Profile: $1" }, "pidTuningDataRefreshed": { "message": "PID data refreshed" }, "pidTuningEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "receiverHelp": { @@ -855,7 +855,7 @@ "message": "RC Tuning data refreshed" }, "receiverEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "auxiliaryHelp": { @@ -874,7 +874,7 @@ "message": "Save" }, "auxiliaryEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "adjustmentsHelp": { @@ -1046,7 +1046,7 @@ "message": "Save" }, "adjustmentsEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "transponderNotSupported": { @@ -1074,7 +1074,7 @@ "message": "Transponder data is invalid" }, "transponderEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "servosFirmwareUpgradeRequired": { @@ -1117,7 +1117,7 @@ "message": "Reverse" }, "servosEepromSave": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "gpsHead": { @@ -1463,7 +1463,7 @@ "message": "HEX file appears to be corrupted" }, "firmwareFlasherRemoteFirmwareLoaded": { - "message": "Remote Firmware loaded, ready for flashing" + "message": "Remote Firmware loaded, ready for flashing" }, "firmwareFlasherFailedToLoadOnlineFirmware": { "message": "Failed to load remote firmware" @@ -1476,7 +1476,7 @@ "message": "Save" }, "ledStripEepromSaved": { - "message": "EEPROM saved" + "message": "EEPROM saved" }, "controlAxisRoll": { diff --git a/images/arrow.svg b/images/arrow.svg index 7560a127..ced5b9eb 100644 --- a/images/arrow.svg +++ b/images/arrow.svg @@ -1,15 +1,18 @@ - - + + + - + l114.7-105.3c5.9-5.5,9.3-13.1,9.3-21.2s-3.4-15.7-9.3-21.2L-665.4-27.6z M-637-207.3c-169,0-306,137-306,306s137,306,306,306 + s306-137,306-306S-468-207.3-637-207.3z M-637,347.4c-137.1,0-248.6-111.5-248.6-248.6S-774.1-149.9-637-149.9 + S-388.4-38.4-388.4,98.7S-499.9,347.4-637,347.4z"/> diff --git a/images/cf_logo_white.svg b/images/cf_logo_white.svg index 6b10d0c6..5fdadf7d 100644 --- a/images/cf_logo_white.svg +++ b/images/cf_logo_white.svg @@ -3,7 +3,7 @@ @@ -19,43 +19,40 @@ h1.4c1.1,0,1.4,0.1,1.6,0.8l16.3,42.3c0.7,1.8,1.3,4,1.6,4.9h0.2c0.4-1,0.9-3,1.5-4.9L548,1.3c0.2-0.7,0.6-0.8,1.6-0.8h1.4 C551.7,0.5,551.8,0.9,551.6,1.4z"/> + - - - - - - - - - + + - - - - - - + + + + + + + + + + diff --git a/images/icons/cf_failsafe_procedure1.svg b/images/icons/cf_failsafe_procedure1.svg index 3b7f5c5d..55fc0520 100644 --- a/images/icons/cf_failsafe_procedure1.svg +++ b/images/icons/cf_failsafe_procedure1.svg @@ -1,48 +1,51 @@ + viewBox="-1117 53.9 264.9 95.1" style="enable-background:new -1117 53.9 264.9 95.1;" xml:space="preserve"> - + - + - - - - + + + - - - - - - - - - - - + C-896.8,92.5-897.5,92.9-898.5,92.9z M-898.7,86.1c-0.8,0-1.3,0.2-1.7,0.6c-0.4,0.4-0.5,1.1-0.5,2V89c0,1.1,0.2,1.8,0.5,2.3 + c0.4,0.5,0.9,0.7,1.7,0.7c0.6,0,1.2-0.3,1.5-0.8c0.4-0.5,0.5-1.2,0.5-2.2c0-0.9-0.2-1.7-0.5-2.1C-897.5,86.3-898,86.1-898.7,86.1 + z"/> + + + diff --git a/images/icons/cf_failsafe_procedure2.svg b/images/icons/cf_failsafe_procedure2.svg index fd80bd06..ede7b9bc 100644 --- a/images/icons/cf_failsafe_procedure2.svg +++ b/images/icons/cf_failsafe_procedure2.svg @@ -1,54 +1,52 @@ + viewBox="-1117 53.9 264.9 95.1" style="enable-background:new -1117 53.9 264.9 95.1;" xml:space="preserve"> - - - - - - - - - - - - - - - - - - - - - + + + + + + - + + + + + + + diff --git a/images/icons/cf_failsafe_procedure3.svg b/images/icons/cf_failsafe_procedure3.svg index c649e1fd..47324fde 100644 --- a/images/icons/cf_failsafe_procedure3.svg +++ b/images/icons/cf_failsafe_procedure3.svg @@ -1,56 +1,56 @@ + viewBox="-1117 53.9 264.9 95.1" style="enable-background:new -1117 53.9 264.9 95.1;" xml:space="preserve"> - - - - - - - - - - - - - - - + + + + + + + - - - + + + - + + - + diff --git a/images/icons/cf_failsafe_procedure4.svg b/images/icons/cf_failsafe_procedure4.svg index db707e4b..97c3cc1d 100644 --- a/images/icons/cf_failsafe_procedure4.svg +++ b/images/icons/cf_failsafe_procedure4.svg @@ -1,82 +1,85 @@ + viewBox="-1117 53.9 264.9 95.1" style="enable-background:new -1117 53.9 264.9 95.1;" xml:space="preserve"> - - - - - - - - + s0.6-0.1,0.8-0.3L-1098.1,114.5z"/> + + + + + + + + + + - - - - - - - - - - - - - - - + + + - + + C-1039.2,124-1039.6,124-1040.1,124z M-1040.3,117.2c-0.6,0-1.1,0.2-1.4,0.6s-0.6,0.9-0.6,1.6h3.9c0-0.7-0.2-1.3-0.5-1.6 + C-1039.3,117.4-1039.8,117.2-1040.3,117.2z"/> - - - - - + + + + + - - + + + diff --git a/images/icons/cf_icon_info_green.svg b/images/icons/cf_icon_info_green.svg index e2dab6dd..b3bbb689 100644 --- a/images/icons/cf_icon_info_green.svg +++ b/images/icons/cf_icon_info_green.svg @@ -1,27 +1,17 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/images/icons/cf_icon_position.png b/images/icons/cf_icon_position.png index 48f8c9da..b90f80e1 100644 Binary files a/images/icons/cf_icon_position.png and b/images/icons/cf_icon_position.png differ diff --git a/images/icons/sensor_acc_on.png b/images/icons/sensor_acc_on.png index ff0a1fce..812a21f5 100644 Binary files a/images/icons/sensor_acc_on.png and b/images/icons/sensor_acc_on.png differ diff --git a/images/icons/sensor_baro_on.png b/images/icons/sensor_baro_on.png index e1bac66b..24372150 100644 Binary files a/images/icons/sensor_baro_on.png and b/images/icons/sensor_baro_on.png differ diff --git a/images/icons/sensor_gyro_on.png b/images/icons/sensor_gyro_on.png index 9f077f72..6f6f41d4 100644 Binary files a/images/icons/sensor_gyro_on.png and b/images/icons/sensor_gyro_on.png differ diff --git a/images/icons/sensor_mag_on.png b/images/icons/sensor_mag_on.png index 65127be2..f9467a4f 100644 Binary files a/images/icons/sensor_mag_on.png and b/images/icons/sensor_mag_on.png differ diff --git a/images/icons/sensor_sat_on.png b/images/icons/sensor_sat_on.png index 402f5512..370ab119 100644 Binary files a/images/icons/sensor_sat_on.png and b/images/icons/sensor_sat_on.png differ diff --git a/images/icons/sensor_sonar_on.png b/images/icons/sensor_sonar_on.png index 494ee0b1..5d87e5e5 100644 Binary files a/images/icons/sensor_sonar_on.png and b/images/icons/sensor_sonar_on.png differ diff --git a/images/inav_icon_128.png b/images/inav_icon_128.png index 40b9747b..3f305b5f 100755 Binary files a/images/inav_icon_128.png and b/images/inav_icon_128.png differ diff --git a/images/inav_icon_128.psd b/images/inav_icon_128.psd index f97a2354..e875ed16 100644 Binary files a/images/inav_icon_128.psd and b/images/inav_icon_128.psd differ diff --git a/images/light-wide-1.svg b/images/light-wide-1.svg index 89172d5c..fb0a4b8c 100644 --- a/images/light-wide-1.svg +++ b/images/light-wide-1.svg @@ -1,131 +1,66 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/light-wide-2.svg b/images/light-wide-2.svg index 1a2f3ce8..acab6422 100644 --- a/images/light-wide-2.svg +++ b/images/light-wide-2.svg @@ -7,52 +7,52 @@ .st1{fill:#37A8DB;} - - - - + + + + - + - - + + C218,2.4,212.4-3.2,205.5-3.2z"/> - - + + - - + + C218,51.2,212.4,56.8,205.5,56.8z"/> - - + + C227.2,51.2,232.8,56.8,239.6,56.8z"/> - + diff --git a/images/map_bg.svg b/images/map_bg.svg new file mode 100644 index 00000000..f4f9cafe --- /dev/null +++ b/images/map_bg.svg @@ -0,0 +1,996 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/js/gui.js b/js/gui.js index 911d16a1..c6c3f23c 100644 --- a/js/gui.js +++ b/js/gui.js @@ -245,7 +245,7 @@ GUI_control.prototype.content_ready = function (callback) { $('.togglesmall').each(function(index, elem) { var switchery = new Switchery(elem, { size: 'small', - color: '#4689c8', + color: '#37a8db', secondaryColor: '#c4c4c4' }); $(elem).on("change", function (evt) { @@ -256,7 +256,7 @@ GUI_control.prototype.content_ready = function (callback) { $('.toggle').each(function(index, elem) { var switchery = new Switchery(elem, { - color: '#4689c8', + color: '#37a8db', secondaryColor: '#c4c4c4' }); $(elem).on("change", function (evt) { @@ -268,7 +268,7 @@ GUI_control.prototype.content_ready = function (callback) { $('.togglemedium').each(function(index, elem) { var switchery = new Switchery(elem, { className: 'switcherymid', - color: '#4689c8', + color: '#37a8db', secondaryColor: '#c4c4c4' }); $(elem).on("change", function (evt) { diff --git a/js/libraries/jbox/jBox.css b/js/libraries/jbox/jBox.css index eed1cb3b..b5a6fac2 100755 --- a/js/libraries/jbox/jBox.css +++ b/js/libraries/jbox/jBox.css @@ -18,7 +18,7 @@ .jBox-container { background: #fff; - border:1px solid #59aa29; + border:1px solid #37a8db; max-width:180px; font-size:11px; line-height:13px; diff --git a/main.css b/main.css index 426fab94..073c882e 100644 --- a/main.css +++ b/main.css @@ -60,9 +60,9 @@ a.disabled { .cf_doc_version_bt a { padding: 1px 9px 1px 9px; margin-top: -45px; - background-color: #0a3a9d; + background-color: #37a8db; border-radius: 3px; - border: 1px solid #06235f; + border: 1px solid #3a9dbf; color: #fff; float: right; font-family: 'open_sansbold', Arial; @@ -75,7 +75,7 @@ a.disabled { } .cf_doc_version_bt a:hover { - background-color: #4689c8; + background-color: #37a8db; transition: all ease 0.2s; } @@ -500,7 +500,7 @@ input[type="number"]::-webkit-inner-spin-button { float: left; height: calc(100% - 150px); width: 200px; - border-right: 4px solid #4689c8; + border-right: 4px solid #37a8db; background-color: #2e2e2e; transition: all 0.2s; @@ -569,14 +569,14 @@ input[type="number"]::-webkit-inner-spin-button { } #tabs li.active a { - background-color: #4689c8; + background-color: #37a8db; color: #fff; transition: none; } #tabs li.active a:hover { cursor: default; - background-color: #4689c8; + background-color: #37a8db; } .tabicon { @@ -968,7 +968,7 @@ dialog { /* Tab Title */ .tab_title { - border-bottom: 1px solid #4689c8; + border-bottom: 1px solid #37a8db; font-size: 20px; line-height: 24px; height: 30px; @@ -1017,9 +1017,9 @@ dialog { margin-top: 0px; margin-bottom: 0px; margin-right: 20px; - background-color: #0a3a9d; + background-color: #37a8db; border-radius: 3px; - border: 1px solid #06235f; + border: 1px solid #3394b5; color: #fff; float: right; font-family: 'open_sansbold', Arial; @@ -1035,12 +1035,12 @@ dialog { } .content_toolbar .btn a:hover { - background-color: #4689c8; + background-color: #3394b5; transition: all ease 0.2s; } .content_toolbar .btn a:active { - background-color: #0a3a9d; + background-color: #37a8db; transition: all ease 0.0s; box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35); } @@ -1166,7 +1166,7 @@ dialog { } .gui_note { - background: #ffffdd; + background: #ffffff; } .gui_warning .gui_box_titlebar { @@ -1180,7 +1180,6 @@ dialog { } .gui_note .gui_box_titlebar { - background-color: #cccc00; background-image: linear-gradient(-45deg, rgba(255, 255, 255, .3) 10%, transparent 10%, transparent 20%, rgba(255, 255, 255, .3) 20%, rgba(255, 255, 255, .3) 30%, transparent 30%, transparent 40%, rgba(255, 255, 255, .3) 40%, rgba(255, 255, 255, .3) 50%, transparent 50%, transparent 60%, @@ -1254,7 +1253,7 @@ dialog { } .fixed_band .save_btn a:hover { - background-color: #6ac435; + background-color: #37a8db; transition: all ease 0.2s; } @@ -1272,8 +1271,8 @@ dialog { text-align: center; background-color: #fff; border-radius: 4px; - border: 1px solid #06235f; - color: #06235f !important; + border: 1px solid #37a8db; + color: #37a8db !important; font-family: 'open_sanssemibold', Arial; font-size: 12px; line-height: 13px; @@ -1283,8 +1282,8 @@ dialog { } .default_btn a:hover { - background-color: #4689c8; - color: #fff; + background-color: #37a8db; + color: #fff !important; text-shadow: 0px 1px rgba(0, 0, 0, 0.25); transition: all ease 0.2s; text-decoration:none; @@ -1292,7 +1291,7 @@ dialog { } .default_btn a:active { - background-color: #0a3a9d; + background-color: #37a8db; transition: all ease 0.0s; box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35); } @@ -1322,10 +1321,10 @@ dialog { } .small a:hover { - background-color: #6ac435; + background-color: #45bce5; color: #fff; text-shadow: 0px 1px rgba(0, 0, 0, 0.25); - border: 1px solid #59aa29; + border: 1px solid #3a9dbf; transition: all ease 0.2s; } @@ -1336,16 +1335,16 @@ dialog { } .green a { - background-color: #59aa29; + background-color: #37a8db; text-shadow: 0px 1px rgba(0, 0, 0, 0.25); color: #fff; - border: 1px solid #59aa29; + border: 1px solid #3a9dbf; transition: all ease 0.2s; } .green a:hover { - background-color: #6ac435; - border: 1px solid #4d9324; + background-color: #45bce5; + border: 1px solid #3a9dbf; text-shadow: 0px 1px rgba(0, 0, 0, 0.25); color: #fff; transition: all ease 0.2s; @@ -1422,8 +1421,8 @@ dialog { } .connect_b a.connect { - background-color: #0a3a9d; - border: 1px solid #06235f; + background-color: #37a8db; + border: 1px solid #339cc1; background-image: url(images/icons/cf_icon_usb2_white.svg); background-repeat: no-repeat; background-size: 44px; @@ -1432,7 +1431,7 @@ dialog { } .connect_b a.connect:hover { - background-color: #4689c8; + background-color: #40b8e2; } .connect_b a.connect.active { @@ -1556,7 +1555,7 @@ dialog { .dataflash-free_global { - background-color: #59AA29; + background-color: #37a8db; border-radius: 4px; } diff --git a/manifest.json b/manifest.json index f24e0fcb..4b942fd8 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "minimum_chrome_version": "38", "version": "1.0.0", "author": "Several", - "name": "INAVFlight - Configurator", + "name": "INAV - Configurator", "short_name": "INAV", "description": "Crossplatform configuration tool for INAVFlight flight control system", diff --git a/resources/motor_order/airplane.svg b/resources/motor_order/airplane.svg index d570999e..2fff12ce 100644 --- a/resources/motor_order/airplane.svg +++ b/resources/motor_order/airplane.svg @@ -38,10 +38,10 @@ - + - + @@ -52,7 +52,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/resources/motor_order/custom.svg b/resources/motor_order/custom.svg index 70a637ba..246f77b0 100644 --- a/resources/motor_order/custom.svg +++ b/resources/motor_order/custom.svg @@ -1,22 +1,59 @@ - - -]> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/motor_order/flying_wing.svg b/resources/motor_order/flying_wing.svg index e414c7ed..d16e0e2d 100644 --- a/resources/motor_order/flying_wing.svg +++ b/resources/motor_order/flying_wing.svg @@ -32,18 +32,18 @@ - + - + - + diff --git a/resources/motor_order/hex_p.svg b/resources/motor_order/hex_p.svg index baced22c..3fc79ac6 100644 --- a/resources/motor_order/hex_p.svg +++ b/resources/motor_order/hex_p.svg @@ -28,27 +28,27 @@ - + - + - + - + - + - + diff --git a/resources/motor_order/hex_x.svg b/resources/motor_order/hex_x.svg index a7929c7f..0e47aa38 100644 --- a/resources/motor_order/hex_x.svg +++ b/resources/motor_order/hex_x.svg @@ -28,27 +28,27 @@ - + - + - + - + - + - + diff --git a/resources/motor_order/quad_p.svg b/resources/motor_order/quad_p.svg index 5c18b059..ce32d535 100644 --- a/resources/motor_order/quad_p.svg +++ b/resources/motor_order/quad_p.svg @@ -22,19 +22,19 @@ - + - + - + - + diff --git a/resources/motor_order/quad_x.svg b/resources/motor_order/quad_x.svg index dc285e89..9ad6c785 100644 --- a/resources/motor_order/quad_x.svg +++ b/resources/motor_order/quad_x.svg @@ -22,19 +22,19 @@ - + - + - + - + diff --git a/resources/motor_order/tri.svg b/resources/motor_order/tri.svg index cf78c46a..9a58eda8 100644 --- a/resources/motor_order/tri.svg +++ b/resources/motor_order/tri.svg @@ -28,15 +28,15 @@ - + - + - + diff --git a/resources/motor_order/vtail_quad.svg b/resources/motor_order/vtail_quad.svg index 1e0e6672..b17567e2 100644 --- a/resources/motor_order/vtail_quad.svg +++ b/resources/motor_order/vtail_quad.svg @@ -22,19 +22,19 @@ - + - + - + - + diff --git a/support/svg_model_motors.rb b/support/svg_model_motors.rb index 4ca0a28c..fec39218 100755 --- a/support/svg_model_motors.rb +++ b/support/svg_model_motors.rb @@ -47,7 +47,7 @@ class Model # Colours BODY_GREY='#bababa' - CIRCLE_GREEN = '#54ad1d' + CIRCLE_GREEN = '#37a8db' ARROW_RED = '#fa0700' # We use StringIO in order to be able to add a (non-)copyright statement diff --git a/tabs/adjustments.css b/tabs/adjustments.css index 61e5dd2c..3aecab1e 100644 --- a/tabs/adjustments.css +++ b/tabs/adjustments.css @@ -3,7 +3,7 @@ } .tab-adjustments .range .marker, .tab-adjustments .channel-slider .noUi-connect { - background: #92b67c; + background: #37a8db; box-shadow: inset 0 0px 2px rgba(0, 0, 0, 0.4), 0px 1px 0px rgba(255, 255, 255, 0.6); } diff --git a/tabs/auxiliary.css b/tabs/auxiliary.css index 486669a2..3cee0a92 100644 --- a/tabs/auxiliary.css +++ b/tabs/auxiliary.css @@ -9,18 +9,17 @@ } .tab-auxiliary .range .marker, .tab-auxiliary .channel-slider .noUi-connect { - background: #59AA29; - background: #92b67c; + background: #37a8db; border-radius: 3px; } .tab-auxiliary .mode.on .info { - background: #59aa29; + background: #37a8db; color: white; } .tab-auxiliary .mode.on:nth-child(odd) .info { - background: #59aa29; + background: #37a8db; } .tab-auxiliary .mode.off .info { diff --git a/tabs/firmware_flasher.css b/tabs/firmware_flasher.css index baf5fe2a..2bfa66a5 100644 --- a/tabs/firmware_flasher.css +++ b/tabs/firmware_flasher.css @@ -61,12 +61,12 @@ } .tab-firmware_flasher .info .progress.valid::-webkit-progress-bar { - background-color: #56ac1d; + background-color: #37a8db; border-radius: 4px; } .tab-firmware_flasher .info .progress.valid::-webkit-progress-value { - background-color: #56ac1d; + background-color: #37a8db; border-radius: 4px; } diff --git a/tabs/firmware_flasher.html b/tabs/firmware_flasher.html index 6085b794..d6a65815 100755 --- a/tabs/firmware_flasher.html +++ b/tabs/firmware_flasher.html @@ -93,7 +93,7 @@
-
diff --git a/tabs/help.css b/tabs/help.css index 15af925b..df17f8d3 100644 --- a/tabs/help.css +++ b/tabs/help.css @@ -28,7 +28,7 @@ } .tab-help li span a { - color: #59aa29; + color: #37a8db; } .tab-help .subline { diff --git a/tabs/landing.css b/tabs/landing.css index 4d755bee..49aff6c8 100755 --- a/tabs/landing.css +++ b/tabs/landing.css @@ -9,20 +9,25 @@ min-height: 100%; height: 100%; overflow-y: auto; - background-color: #06235f; + background-color: #424242; } .tab-landing .content_top { height: 140px; - background: #4689c8; + background: white; + background-image:url(/images/map_bg.svg); padding: 20px; } .tab-landing .content_mid { - background-color: #eaeaea; + background-color: #37a8db; overflow: hidden; } +.tab-landing .content_mid a { + color: white; +} + .tab-landing .content_foot { clear: both; padding: 20px; @@ -35,7 +40,7 @@ margin-right: auto; margin-top: 5px; width: 800px; - color: white; + color: black; font-size: 14px; font-family: 'open_sanslight', Arial; } @@ -91,6 +96,11 @@ font-weight: normal; font-family: 'open_sansregular', Arial; font-size: 12px; + color: #c2efff; +} + +.text3 { + color: black; } /* text columns */ @@ -109,6 +119,7 @@ .tab-landing .content_mid h2 { margin-bottom: 5px; font-size: 13px; + color: white; } .tab-landing .content_mid h3 { @@ -170,7 +181,7 @@ #changelog .wrapper { height: 100%; padding: 0 20px; - border-left: 5px solid green; + border-left: 5px solid #3394b5; overflow-y: auto; display: none; } @@ -180,7 +191,7 @@ top: 50px; right: 215px; position: absolute; - background: green; + background: #3394b5; border-radius: 5px 5px 0 0; border-bottom: none; height: 30px; diff --git a/tabs/led_strip.css b/tabs/led_strip.css index 4a4783d2..db6ebc7f 100644 --- a/tabs/led_strip.css +++ b/tabs/led_strip.css @@ -304,7 +304,7 @@ .tab-led-strip .wires-remaining div { font-size: 40px; - color: #7AAE2D; + color: #37a8db; font-family: monospace; } diff --git a/tabs/modes.css b/tabs/modes.css index 418aac30..abce1710 100644 --- a/tabs/modes.css +++ b/tabs/modes.css @@ -23,7 +23,7 @@ .tab-modes .boxes .on { color: white; - background-color: #0d8b13; + background-color: #37a8db; } .tab-modes .boxes .off { diff --git a/tabs/motors.css b/tabs/motors.css index 8b2228f3..11b0dc74 100644 --- a/tabs/motors.css +++ b/tabs/motors.css @@ -221,7 +221,7 @@ } .tab-motors .titles .active { - color: green; + color: #37a8db; } .tab-motors .m-block { diff --git a/tabs/motors.js b/tabs/motors.js index e6aa6e7e..641428ca 100644 --- a/tabs/motors.js +++ b/tabs/motors.js @@ -480,7 +480,7 @@ TABS.motors.initialize = function (callback) { color = parseInt(data * 0.009); $('.motor-' + i + ' .label', motors_wrapper).text(MOTOR_DATA[i]); - $('.motor-' + i + ' .indicator', motors_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(89,170,41,1.'+ color +')'}); + $('.motor-' + i + ' .indicator', motors_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : '#37a8db'+ color +')'}); } // servo indicators are still using old (not flexible block scale), it will be changed in the future accordingly @@ -491,7 +491,7 @@ TABS.motors.initialize = function (callback) { color = parseInt(data * 0.009); $('.servo-' + i + ' .label', servos_wrapper).text(SERVO_DATA[i]); - $('.servo-' + i + ' .indicator', servos_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(89,170,41,1'+ color +')'}); + $('.servo-' + i + ' .indicator', servos_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : '#37a8db'+ color +')'}); } //keep the following here so at least we get a visual cue of our motor setup update_arm_status(); diff --git a/tabs/onboard_logging.css b/tabs/onboard_logging.css index c5e65740..12284b9f 100644 --- a/tabs/onboard_logging.css +++ b/tabs/onboard_logging.css @@ -107,7 +107,7 @@ .tab-onboard_logging .dataflash-used, .tab-onboard_logging .sdcard-other { - background-color: #0a3a9d; + background-color: #37a8db; border-radius: 4px; } @@ -263,9 +263,9 @@ margin-top: 8px; margin-bottom: 8px; margin-right: 10px; - background-color: #0a3a9d; + background-color: #37a8db; border-radius: 3px; - border: 1px solid #06235f; + border: 1px solid #3599bc; color: #fff; font-family: 'open_sansbold', Arial; font-size: 12px; @@ -279,11 +279,11 @@ line-height: 28px; } .tab-onboard_logging .regular-button:hover { - background-color: #4689c8; + background-color: #3599bc; transition: all ease 0.2s; } .tab-onboard_logging .regular-button:active { - background-color: #4d9324; + background-color: #3599bc; transition: all ease 0.0s; box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35); } diff --git a/tabs/receiver.js b/tabs/receiver.js index 3b7c143d..e5b5cd6b 100644 --- a/tabs/receiver.js +++ b/tabs/receiver.js @@ -244,7 +244,7 @@ TABS.receiver.initialize = function (callback) { context.moveTo(midx, midy); context.quadraticCurveTo(midxr, midyr, 200, 0); context.lineWidth = 2; - context.strokeStyle = '#59aa29'; + context.strokeStyle = '#37a8db'; context.stroke(); }, 0); }).trigger('input'); @@ -277,7 +277,7 @@ TABS.receiver.initialize = function (callback) { context.moveTo(0, rateHeight); context.quadraticCurveTo(110, rateHeight - ((ratey / 2) * (1 - expo)), 200, rateHeight - ratey); context.lineWidth = 2; - context.strokeStyle = '#59aa29'; + context.strokeStyle = '#37a8db'; context.stroke(); }, 0); }).trigger('input'); diff --git a/tabs/receiver_msp.css b/tabs/receiver_msp.css index 1c16f6c5..065d5565 100644 --- a/tabs/receiver_msp.css +++ b/tabs/receiver_msp.css @@ -113,9 +113,9 @@ a:hover { margin-top: 0px; margin-bottom: 0px; margin-left: 0px; - background-color: #59aa29; + background-color: #37a8db; border-radius: 3px; - border: 1px solid #4c8829; + border: 1px solid #37a8db; color: #fff; float: left; font-family: 'open_sansbold', Arial; @@ -131,11 +131,11 @@ a:hover { } .button-enable a:hover { - background-color: #6ac435; + background-color: #37a8db; transition: all ease 0.2s; } .button-enable a:active { - background-color: #4d9324; + background-color: #37a8db; transition: all ease 0.0s; box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35); } \ No newline at end of file