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

Fixing tab area (when log is open) = now scrollable. Also fixed: receiverMSP Button

10.3.x-maintenance
Albert Kravcov 2015-11-15 16:33:37 +01:00
parent 4e8fc955b0
commit 34a45e0b9b
4 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.css
View File

@ -111,9 +111,9 @@ input[type="number"]::-webkit-inner-spin-button {
} }
.headerbar { .headerbar {
height:110px; height:110px;
width:100%; width:100%;
background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.15)); background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.15));
} }
@ -512,6 +512,13 @@ input[type="number"]::-webkit-inner-spin-button {
background-color: #2e2e2e; background-color: #2e2e2e;
} }
.tab_container.logopen {
height: calc(100% - 235px);
overflow-x: hidden;
overflow-y: auto;
}
#tabs { #tabs {
font-size: 13px; font-size: 13px;
} }
@ -523,7 +530,6 @@ input[type="number"]::-webkit-inner-spin-button {
#tabs.logopen ul { #tabs.logopen ul {
/* Cause the height to shrink to contain its floated contents while log is open */ /* Cause the height to shrink to contain its floated contents while log is open */
} }
.header-wrapper .mode-connected { .header-wrapper .mode-connected {
@ -885,13 +891,8 @@ dialog {
} }
.content_wrapper { .content_wrapper {
/* leave 20px side padding always */ padding: 20px;
/*padding: 0 20px 0 20px; position: relative;
for testing: */
padding: 20px;
position: relative;
/*float: left;
width:calc(100% - 40px);*/
} }
.content_toolbar { .content_toolbar {
@ -1097,9 +1098,6 @@ dialog {
} }
.fixed_band .save_btn a { .fixed_band .save_btn a {
/* line-height:20px;
padding:3px 13px 5px 13px;
*/
margin-top: 9px; margin-top: 9px;
margin-bottom: 0px; margin-bottom: 0px;
margin-right: 20px; margin-right: 20px;
@ -1353,7 +1351,7 @@ dialog {
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
font-size: 10px; font-size: 10px;
} }
.fixfalse { .fixfalse {
background-color: #e60000; background-color: #e60000;

6
main.js
View File

@ -367,8 +367,8 @@ $("#showlog").on('click', function() {
if ( state ) { if ( state ) {
$("#log").animate({height: 27}, 200); $("#log").animate({height: 27}, 200);
$("#log").removeClass('active'); $("#log").removeClass('active');
$("#content").removeClass('logopen'); $("#content").removeClass('logopen');
$("#tabs").removeClass('logopen'); $(".tab_container").removeClass('logopen');
$("#scrollicon").removeClass('active'); $("#scrollicon").removeClass('active');
state = false; state = false;
@ -376,7 +376,7 @@ $("#showlog").on('click', function() {
$("#log").animate({height: 111}, 200); $("#log").animate({height: 111}, 200);
$("#log").addClass('active'); $("#log").addClass('active');
$("#content").addClass('logopen'); $("#content").addClass('logopen');
$("#tabs").addClass('logopen'); $(".tab_container").addClass('logopen');
$("#scrollicon").addClass('active'); $("#scrollicon").addClass('active');
state = true; state = true;

44
tabs/receiver_msp.css
View File

@ -98,10 +98,44 @@ body {
left: -65px; left: -65px;
} }
.button-enable { a {
padding: 0.5em; text-decoration: none;
font-size: 110%; color: #000;
margin-left: auto; font-family: 'open_sanssemibold', Arial;
margin-right: auto; }
a:hover {
text-decoration: none;
}
.button-enable a {
/* common styles for content toolbar buttons */
margin-top: 0px;
margin-bottom: 0px;
margin-left: 0px;
background-color: #59aa29;
border-radius: 3px;
border: 1px solid #4c8829;
color: #fff;
float: left;
font-family: 'open_sansbold', Arial;
font-size: 12px;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
display: block; display: block;
cursor: pointer;
transition: all ease 0.2s;
padding: 0px;
padding-left: 9px;
padding-right: 9px;
line-height: 28px;
}
.button-enable a:hover {
background-color: #6ac435;
transition: all ease 0.2s;
}
.button-enable a:active {
background-color: #4d9324;
transition: all ease 0.0s;
box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35);
} }

5
tabs/receiver_msp.html
View File

@ -1,5 +1,6 @@
<html> <html>
<head> <head>
<link type="text/css" rel="stylesheet" href="../css/opensans_webfontkit/fonts.css" media="all" />
<script type="text/javascript" src="/js/libraries/jquery-2.1.4.min.js"></script> <script type="text/javascript" src="/js/libraries/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/js/libraries/jquery-ui-1.11.4.min.js"></script> <script type="text/javascript" src="/js/libraries/jquery-ui-1.11.4.min.js"></script>
<script type="text/javascript" src="/js/libraries/jquery.nouislider.all.min.js"></script> <script type="text/javascript" src="/js/libraries/jquery.nouislider.all.min.js"></script>
@ -56,7 +57,9 @@
This feature does not guarantee reliable control of your craft. <strong>Serious injury is likely to This feature does not guarantee reliable control of your craft. <strong>Serious injury is likely to
result if propellers are left on.</strong> result if propellers are left on.</strong>
</p> </p>
<button class="button-enable" type="button">Enable controls</button> <div class="button-enable btn">
<a class="button-enable" href="#">Enable controls</a>
</div>
</div> </div>
</body> </body>
</html> </html>