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

after compatbility remove css and initialize3d routine cleanup

10.3.x-maintenance
cTn 2014-10-12 18:54:11 +02:00
parent ecd34bf113
commit 4fe8d66bf5
2 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
tabs/setup.css
View File

@ -1,34 +1,6 @@
/* requires cleanup */
.tab-setup .CAP_BASEFLIGHT_CONFIG { .tab-setup .CAP_BASEFLIGHT_CONFIG {
height: calc(100% - 138px); height: calc(100% - 138px);
} }
.tab-setup #interactive_block {
width: calc(100% - 199px);
}
.tab-setup .gps {
width: 185px;
}
.tab-setup .gps .fields {
padding: 5px 5px 3px 5px;
}
.tab-setup .gps dt {
float: left;
width: 85px;
height: 20px;
margin-bottom: 2px;
line-height: 20px;
}
.tab-setup .gps dd {
height: 20px;
margin-left: 85px;
margin-bottom: 2px;
line-height: 20px;
}
.tab-setup { .tab-setup {
height: 100%; height: 100%;
} }
@ -84,24 +56,24 @@
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
#interactive_block { .tab-setup #interactive_block {
float: left; float: left;
position: relative; position: relative;
height: 100%; height: 100%;
width: calc(100% - 522px); width: calc(100% - 199px);
border: 1px solid silver; border: 1px solid silver;
background-color: white; background-color: white;
} }
#interactive_block .heading { .tab-setup #interactive_block .heading {
float: right; float: right;
height: 15px; height: 15px;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
font-weight: bold; font-weight: bold;
} }
#interactive_block a.reset { .tab-setup #interactive_block a.reset {
position: absolute; position: absolute;
display: block; display: block;
@ -121,10 +93,10 @@
z-index: 100; z-index: 100;
} }
#interactive_block a.reset:hover { .tab-setup #interactive_block a.reset:hover {
background-color: #dedcdc; background-color: #dedcdc;
} }
#canvas_wrapper { .tab-setup #canvas_wrapper {
position: absolute; position: absolute;
width: 100%; width: 100%;
@ -155,35 +127,55 @@
background-color: #ececec; background-color: #ececec;
} }
.tab-setup .block.info { .tab-setup .block.info {
width: 200px;
}
.tab-setup .info {
display: inline-block; display: inline-block;
margin-bottom: 10px;
vertical-align: top; vertical-align: top;
margin: 0 0 10px 10px;
font-size: 12px; font-size: 12px;
border: 1px solid silver; border: 1px solid silver;
} }
.tab-setup .info .fields { .tab-setup .block.info .fields {
padding: 5px 5px 3px 5px; padding: 5px 5px 3px 5px;
} }
.tab-setup .info dt { .tab-setup .block.info dt {
float: left; float: left;
width: 99px; width: 99px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
} }
.tab-setup .info dd { .tab-setup .block.info dd {
width: 76px; width: 76px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin-left: 99px; margin-left: 99px;
} }
.tab-setup .block.gps {
width: 185px;
}
.tab-setup .block.gps .fields {
padding: 5px 5px 3px 5px;
}
.tab-setup .block.gps dt {
float: left;
width: 85px;
height: 20px;
margin-bottom: 2px;
line-height: 20px;
}
.tab-setup .block.gps dd {
height: 20px;
margin-left: 85px;
margin-bottom: 2px;
line-height: 20px;
}
.tab-setup .buttons { .tab-setup .buttons {
width: calc(100% - 20px); width: calc(100% - 20px);

7
tabs/setup.js
View File

@ -35,7 +35,7 @@ TABS.setup.initialize = function (callback) {
localize(); localize();
// initialize 3D // initialize 3D
self.initialize3D(false); self.initialize3D();
// set heading in interactive block // set heading in interactive block
$('span.heading').text(chrome.i18n.getMessage('initialSetupheading', [0])); $('span.heading').text(chrome.i18n.getMessage('initialSetupheading', [0]));
@ -175,13 +175,8 @@ TABS.setup.initialize3D = function (compatibility) {
loader, canvas, wrapper, renderer, camera, scene, light, light2, modelWrapper, model, model_file, loader, canvas, wrapper, renderer, camera, scene, light, light2, modelWrapper, model, model_file,
fallback = false; fallback = false;
if (compatibility) {
canvas = $('.COMPATIBILITY #canvas');
wrapper = $('.COMPATIBILITY #canvas_wrapper');
} else {
canvas = $('.CAP_BASEFLIGHT_CONFIG #canvas'); canvas = $('.CAP_BASEFLIGHT_CONFIG #canvas');
wrapper = $('.CAP_BASEFLIGHT_CONFIG #canvas_wrapper'); wrapper = $('.CAP_BASEFLIGHT_CONFIG #canvas_wrapper');
}
// webgl capability detector // webgl capability detector
// it would seem the webgl "enabling" through advanced settings will be ignored in the future // it would seem the webgl "enabling" through advanced settings will be ignored in the future