sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cleanflight/development' into GUI-rework 

Conflicts:
	tabs/motors.css
10.3.x-maintenance
skaman82 2015-11-10 09:47:42 +01:00
parent b6b2812271
commit da4899bed5
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tabs/firmware_flasher.js
View File

@ -43,7 +43,7 @@ TABS.firmware_flasher.initialize = function (callback) {
var releaseDescriptors = []; var releaseDescriptors = [];
TABS.firmware_flasher.releases.forEach(function(release){ TABS.firmware_flasher.releases.forEach(function(release){
release.assets.forEach(function(asset){ release.assets.forEach(function(asset){
var targetFromFilenameExpression = /.*_(.*)\.(.*)/; var targetFromFilenameExpression = /w*_(.*)\.(.*)/;
var match = targetFromFilenameExpression.exec(asset.name); var match = targetFromFilenameExpression.exec(asset.name);
if (!showDevReleases && release.prerelease) { if (!showDevReleases && release.prerelease) {
@ -54,7 +54,7 @@ TABS.firmware_flasher.initialize = function (callback) {
return; return;
} }
var target = match[1]; var target = match[1].replace("_", " ");
var format = match[2]; var format = match[2];
if (format != 'hex') { if (format != 'hex') {
@ -530,5 +530,3 @@ TABS.firmware_flasher.cleanup = function (callback) {
if (callback) callback(); if (callback) callback();
}; };

12
tabs/motors.css
View File

@ -197,14 +197,14 @@
.tab-motors .titles li { .tab-motors .titles li {
float: left; float: left;
width: calc(( 100% / 9) - 10px); width: calc((100% / 9) - 10px);
margin-right: 10px; margin-right: 10px;
text-align: center; text-align: center;
} }
.tab-motors .servos .titles li { .tab-motors .servos .titles li {
float: right; float: right;
width: calc(( 100% / 8) - 10px); width: calc((100% / 8) - 10px);
margin: 0 0 0 10px; margin: 0 0 0 10px;
} }
@ -214,7 +214,7 @@
.tab-motors .m-block { .tab-motors .m-block {
float: left; float: left;
width: calc(( 100% / 9) - 10px); width: calc((100% / 9) - 10px);
height: 100px; height: 100px;
margin-right: 10px; margin-right: 10px;
text-align: center; text-align: center;
@ -248,7 +248,7 @@
.tab-motors .servos .m-block { .tab-motors .servos .m-block {
float: right; float: right;
width: calc(( 100% / 8) - 10px); width: calc((100% / 8) - 10px);
margin: 0 0 0 10px; margin: 0 0 0 10px;
border-radius: 3px; border-radius: 3px;
} }
@ -271,7 +271,7 @@
.tab-motors .motor_testing .sliders input { .tab-motors .motor_testing .sliders input {
-webkit-appearance: slider-vertical; -webkit-appearance: slider-vertical;
width: calc(( 100% / 9) - 13px); width: calc((100% / 9) - 13px);
height: 73px; height: 73px;
margin-left: 10px; margin-left: 10px;
} }
@ -290,7 +290,7 @@
.tab-motors .motor_testing .values li { .tab-motors .motor_testing .values li {
float: left; float: left;
width: calc(( 100% / 9)- 10px); width: calc((100% / 9) - 10px);
margin-left: 10px; margin-left: 10px;
text-align: center; text-align: center;
} }