1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 17:25:16 +03:00

Polishing the toolbar related styles. Fixing styles.

This commit is contained in:
Kristjan Vaga 2015-11-05 19:22:39 +02:00
parent 86c9733e52
commit 76fc0176da
22 changed files with 124 additions and 327 deletions

View file

@ -29,9 +29,14 @@ a {
a:hover {
text-decoration: none;
}
a.disabled {
pointer-events: none;
cursor: default;
color: #999;
}
}
/* Help-Icon */
@ -958,8 +963,8 @@ dialog {
/* Tab Title */
.tab_title {
float:left;
width:100%;
/*float:left; why?
width:100%; */
border-bottom:1px solid #59aa29;
font-size:20px;
line-height:24px;
@ -970,12 +975,12 @@ dialog {
/* Note */
.note {
float:left;
/*float:left; why this? */
background-color:#fff7cd;
border:1px solid #ffe55f;
margin-bottom:7px;
margin-top:3px;
width:100%;
/*width:100%;*/
border-radius: 3px;
font-size:11px;
font-family: 'open_sansregular', Arial;
@ -1001,6 +1006,7 @@ dialog {
/*padding: 0 20px 0 20px;
for testing: */
padding: 20px;
position: relative;
}
.content_toolbar {
@ -1023,9 +1029,15 @@ dialog {
text-align: center;
font-weight: bold;
border: 1px solid silver;
border-radius: 3px;
background-color: #ececec;
}
.content_toolbar .btn:hover {
background-color: #fff;
border-color: #999;
}
.toolbar_scroll_bottom .content_wrapper {
/* content wrapper in view with toolbar in scroll bottom
leave 50px space for the toolbar
@ -1045,6 +1057,7 @@ dialog {
.toolbar_fixed_bottom .content_toolbar {
position: absolute;
bottom: 0;
z-index: 2000; /* for fancy toggle buttons */
}

View file

@ -100,23 +100,3 @@
.tab-adjustments > .buttons {
margin-top: 10px;
}
.tab-adjustments > .buttons a {
float: right;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
display: block;
}
.tab-adjustments .buttons a {
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-adjustments .buttons a:hover {
background-color: #dedcdc;
}

View file

@ -1,10 +1,16 @@
.tab-cli {
height: 100%;
}
.tab-cli .content_wrapper {
height: calc(100% - 50px);
}
.tab-cli p {
padding: 0px;
border: 0px dotted silver;
}
.tab-cli .note {
margin-bottom:20px;
}
.tab-cli .backdrop {
border: 1px solid silver;
background-color: rgba(0,0,0,0.75);
@ -19,7 +25,7 @@
/* */
border-radius: 5px;
box-shadow: inset 0px 0px 20px rgba(0,0,0,0.80);
float:left;
/*float:left;*/
width:100%;
}
@ -60,4 +66,4 @@
}
.tab-cli .window .wrapper {
white-space: pre-wrap;
}
}

View file

@ -1,5 +1,6 @@
<div class="tab-cli">
<div class="note" style="margin-bottom:20px;">
<div class="content_wrapper">
<div class="note">
<div class="note_spacer">
<p i18n="cliInfo"></p>
</div>
@ -10,4 +11,5 @@
</div>
</div>
<textarea name="commands" i18n_placeholder="cliInputPlaceholder" rows="1" cols="0"></textarea>
</div>
</div>
</div>

View file

@ -147,7 +147,7 @@ TABS.cli.read = function (readInfo) {
case 62:
text += '&gt';
break;
default:
text += String.fromCharCode(data[i]);
}
@ -169,7 +169,7 @@ TABS.cli.read = function (readInfo) {
$('.tab-cli .window').scrollTop($('.tab-cli .window .wrapper').height());
// there seems to be some sort of initial rendering glitch in 33+, we will force redraw/refill
$('.tab-cli .window .wrapper').css('webkitTransform', 'scale(1)');
//$('.tab-cli .window .wrapper').css('webkitTransform', 'scale(1)');
};
TABS.cli.cleanup = function (callback) {
@ -199,4 +199,4 @@ TABS.cli.cleanup = function (callback) {
if (callback) callback();
}, 5000); // if we dont allow enough time to reboot, CRC of "first" command sent will fail, keep an eye for this one
});
};
};

View file

@ -27,7 +27,7 @@
.tab-configuration table td {
padding-left:5px;
border-bottom: 1px solid #ddd;
@ -170,24 +170,6 @@
.tab-configuration .disarm .checkbox span {
margin-left: 0px;
}
.tab-configuration .save {
display: block;
float: right;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-configuration .save:hover {
background-color: #dedcdc;
}
.tab-configuration .freelabel {
@ -205,31 +187,31 @@ margin:0px
}
.tab-configuration .disarm .checkbox {
.tab-configuration .disarm .checkbox {
float:left;
padding-left:0px;
margin-top: -5px;
padding-left:0px;
margin-top: -5px;
padding-bottom:5px;
border-bottom: 1px solid #ddd;
width:100%;
}
.tab-configuration .spacer_box {
padding-bottom 10px;
.tab-configuration .spacer_box {
padding-bottom 10px;
float: left;
width: calc(100% - 20px);
}
.tab-configuration .number {
.tab-configuration .number {
padding-bottom:5px;
border-bottom: 1px solid #ddd;
width:100%;
float: left;
}
.tab-configuration .disarm {
.tab-configuration .disarm {
margin-bottom:5px;
float:left;
border-bottom: 1px solid #ddd;
@ -243,7 +225,7 @@ width:100%;
.tab-configuration .number:last-child {
.tab-configuration .number:last-child {
border-bottom:none;
padding-bottom:0px;
margin-bottom:0px;
@ -251,13 +233,13 @@ padding-bottom:0px;
}
.tab-configuration .gui_box_titlebar {
margin-bottom: 0px;
.tab-configuration .gui_box_titlebar {
margin-bottom: 0px;
}
.tab-configuration .numberspacer {
float:left;
width:65px;
float:left;
width:65px;
height:21px;
}
@ -270,7 +252,7 @@ height:21px;
float:left;
}
.tab-configuration .rssi td {
border-bottom:none;
padding-bottom:0px;
@ -283,14 +265,14 @@ height:21px;
float:left;
}
.tab-configuration .rssi .gui_box {
min-height:140px;
float:left;
}
.tab-configuration .mixer .gui_box, .tab-configuration .motorstop .gui_box {
min-height:287px;
float:left;
@ -299,24 +281,24 @@ height:21px;
.tab-configuration .mixer .gui_box {
}
.tab-configuration .current .gui_box {
min-height:227px;
float:left;
}
.tab-configuration .gps .gui_box {
min-height:352px;
float:left;
}
.tab-configuration .system .gui_box {
min-height:100px;
}
.tab-configuration .other tr:last-child td{
border-bottom:0px;
@ -326,21 +308,21 @@ height:21px;
}
.tab-configuration .mixerPreview {
max-width:230px;
max-width:230px;
background-color: #eeeeee;
text-align: center;
float:left;
border-radius:5px;
margin-top:5px;
}
.tab-configuration .mixerPreview img {
width: 90%;
height: 90%;
padding:5%;
}
.tab-configuration .rxMode tr:last-child td{
border-bottom:0px;
padding-bottom:0px;
@ -385,6 +367,6 @@ height:21px;
.tab-configuration .current .gui_box {
min-height:214px;
}
}
}

View file

@ -72,37 +72,12 @@
position: absolute;
bottom: 10px;
}
.tab-dataflash .buttons a {
display: block;
float: right;
margin-left: 10px;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-dataflash .buttons a:hover {
background-color: #dedcdc;
}
.tab-dataflash .buttons a.disabled {
cursor: default;
color: #999;
pointer-events: none;
}
.tab-dataflash .dataflash-progress {
display: none;
}
.tab-dataflash .dataflash-contents {
margin:9px 16px;
border:1px solid silver;
background-color:#eee;
@ -110,7 +85,7 @@
flex-direction:row;
flex-wrap:nowrap;
justify-content:flex-start;
border-radius:6px;
}
.tab-dataflash .dataflash-contents li {
@ -189,4 +164,4 @@
}
.tab-dataflash.supported .require-no-dataflash {
display:none;
}
}

View file

@ -1,4 +1,5 @@
<div class="tab-gps">
<div class="content_wrapper">
<div class="GPS_info">
<span class="head" i18n="gpsHead"></span>
<table>
@ -122,4 +123,5 @@
</tr>
</table>
</div>
</div>
</div>
</div>

View file

@ -32,7 +32,7 @@
.tab-led-strip .gPoint.function-w { /* Warning */
background: red;
box-shadow: inset 0 0 30px rgba(0, 0, 0, .7);
border-color: red;
border-color: red;
}
.tab-led-strip .gPoint.function-f { /* Flight mode & orientation */
@ -44,7 +44,7 @@
.tab-led-strip .gPoint.function-i { /* Indicator */
background: yellow;
box-shadow: inset 0 0 30px rgba(0, 0, 0, .7);
border-color: yellow;
border-color: yellow;
}
.tab-led-strip .gPoint.function-a { /* Armed Mode */
@ -205,12 +205,12 @@
.tab-led-strip .indicators {
position: relative;
height: 30px
height: 30px
}
.tab-led-strip .indicators span {
width: 0;
height: 0;
width: 0;
height: 0;
position: absolute;
display: none;
font-size: 10px;
@ -219,44 +219,44 @@
.tab-led-strip .indicators .north {
top: -4px;
left: 7px;
left: 7px;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid rgba(0,0,0,.8);
}
.tab-led-strip .indicators .south {
bottom: -2px;
left: 7px;
left: 7px;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-right: 7px solid transparent;
border-top: 7px solid rgba(0,0,0,.8);
}
.tab-led-strip .indicators .east {
bottom: 8px;
right: -5px;
right: -5px;
border-top: 7px solid transparent;
border-bottom: 7px solid transparent;
border-bottom: 7px solid transparent;
border-left: 7px solid rgba(0,0,0,.8);
}
.tab-led-strip .indicators .west {
bottom: 8px;
left: -5px;
left: -5px;
border-top: 7px solid transparent;
border-bottom: 7px solid transparent;
border-bottom: 7px solid transparent;
border-right: 7px solid rgba(0,0,0,.8);
}
.tab-led-strip .indicators .up {
top: 0px;
left: 2px;
left: 2px;
}
.tab-led-strip .indicators .down {
bottom: 17px;
right: 10px;
right: 10px;
}
.tab-led-strip .dir-n .north {display: inline;}
@ -318,26 +318,6 @@
margin-top: 10px;
}
.tab-led-strip .save {
display: block;
float: right;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-led-strip.save:hover {
background-color: #dedcdc;
}
.gridSections {
position: absolute;
z-index: -1;
@ -374,5 +354,5 @@
background: rgba(0,0,0,.4);
position: absolute;
z-index: 100;
border: 1px dotted white;
border: 1px dotted white;
}

View file

@ -1,4 +1,5 @@
<div class="tab-led-strip">
<div class="tab-led-strip toolbar_fixed_bottom">
<div class="content_wrapper">
<div class="help">
<p i18n="ledStripHelp"></p>
</div>
@ -37,7 +38,7 @@
<button class="function-r w50">Ring</button>
<button class="function-c w50">Color</button>
</div>
<div class="section">LED Orientation and Color</div>
<div class="directions">
<button class="dir-n">N</button>
@ -74,12 +75,12 @@
<div class="wiringControls">
<button class="funcWireClearSelect w50">Clear selected</button>
<button class="funcWireClear w50">Clear ALL Wiring</button>
</div>
</div>
<p>LEDs without wire ordering number will not be saved.</p>
</div>
<div class="clear-both"></div>
<div class="buttons">
<a class="save" href="#" i18n="ledStripButtonSave"></a>
</div>
</div>
</div>
<div class="content_toolbar">
<div class="btn save_btn"><a class="save" href="#" i18n="ledStripButtonSave"></a></div>
</div>
</div>

View file

@ -54,26 +54,6 @@
position: absolute;
bottom: 10px;
}
.tab-logging .buttons a {
display: block;
float: right;
margin-left: 10px;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-logging .buttons a:hover {
background-color: #dedcdc;
}
.tab-logging .buttons .back {
display: none;
}
}

View file

@ -44,21 +44,3 @@
position: absolute;
bottom: 10px;
}
.tab-modes .update {
display: block;
float: right;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-modes .update:hover {
background-color: #dedcdc;
}

View file

@ -1,5 +1,6 @@
<div id="content-watermark"></div>
<div class="tab-motors">
<div class="content_wrapper">
<div class="wrapper modelAndAccel">
<div class="mixerPreview">
<img src="./resources/motor_order/custom.svg" />
@ -113,3 +114,4 @@
<div class="cler-both"></div>
</div>
</div>
</div>

View file

@ -96,29 +96,6 @@
right:10px;
bottom: 10px;
}
.tab-pid_tuning .update,
.tab-pid_tuning .refresh {
display: block;
float: right;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-pid_tuning .refresh {
margin-right: 10px;
}
.tab-pid_tuning .update:hover,
.tab-pid_tuning .refresh:hover {
background-color: #dedcdc;
}
.tab-pid_tuning .top-buttons {
float:right;
}
}

View file

@ -11,7 +11,7 @@
.tab-ports table {
margin-bottom: 10px;
width:100%;
border-collapse:collapse;
}
.tab-ports table,
@ -26,11 +26,11 @@
}
.tab-ports table tr td:first-child {
text-align: left;
}
table.ports tr:first-child td:first-child { border-top-left-radius: 0px;
}
table.ports tr:first-child td:last-child { border-top-right-radius: 0px; }
table.ports tr:first-child td:first-child { border-top-left-radius: 0px;
}
table.ports tr:first-child td:last-child { border-top-right-radius: 0px; }
@ -54,8 +54,8 @@ table.ports tr:first-child td:last-child { border-top-right-radius: 0px; }
font-size:14px;
height:25px;
font-family: 'open_sansregular', Arial;
}
.tab-ports .function input {
@ -70,24 +70,6 @@ table.ports tr:first-child td:last-child { border-top-right-radius: 0px; }
border: 1px solid silver;
}
.tab-ports .save {
display: block;
float: right;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-ports .save:hover {
background-color: #dedcdc;
}
.tab-ports .require-support {

View file

@ -299,33 +299,7 @@
position: absolute;
bottom: 10px;
}
.tab-receiver .sticks,
.tab-receiver .update,
.tab-receiver .refresh {
display: block;
float: right;
margin-top: 22px;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-receiver .sticks,
.tab-receiver .refresh {
margin-right: 10px;
}
.tab-receiver .update:hover,
.tab-receiver .refresh:hover {
background-color: #dedcdc;
}
/* SVG classes*/
.tab-receiver .grid .tick {
stroke: silver;

View file

@ -23,7 +23,7 @@ TABS.receiver.initialize = function (callback) {
function get_rc_map() {
MSP.send_message(MSP_codes.MSP_RX_MAP, false, false, load_config);
}
// Fetch features so we can check if RX_MSP is enabled:
function load_config() {
MSP.send_message(MSP_codes.MSP_BF_CONFIG, false, false, load_html);
@ -317,17 +317,17 @@ TABS.receiver.initialize = function (callback) {
MSP.send_message(MSP_codes.MSP_SET_RC_TUNING, MSP.crunch(MSP_codes.MSP_SET_RC_TUNING), false, save_rc_map);
});
$("a.sticks").click(function() {
var
windowWidth = 370,
windowHeight = 510;
chrome.app.window.create("/tabs/receiver_msp.html", {
id: "receiver_msp",
innerBounds: {
minWidth: windowWidth, minHeight: windowHeight,
width: windowWidth, height: windowHeight,
width: windowWidth, height: windowHeight,
maxWidth: windowWidth, maxHeight: windowHeight
},
alwaysOnTop: true
@ -343,9 +343,9 @@ TABS.receiver.initialize = function (callback) {
}
});
});
// Only show the MSP control sticks if the MSP Rx feature is enabled
$("a.sticks").toggle(bit_check(BF_CONFIG.features, 14 /* RX_MSP */));
$(".sticks_btn").toggle(bit_check(BF_CONFIG.features, 14 /* RX_MSP */));
$('select[name="rx_refresh_rate"]').change(function () {
var plot_update_rate = parseInt($(this).val(), 10);

View file

@ -1,5 +1,6 @@
<div id="content-watermark"></div>
<div class="tab-sensors">
<div class="content_wrapper">
<div class="info">
<p i18n="sensorsInfo">
Keep in mind that using fast update periods and rendering multiple graphs at the same time
@ -267,3 +268,4 @@
</svg>
</div>
</div>
</div>

View file

@ -106,27 +106,6 @@
position: absolute;
bottom: 10px;
}
.tab-servos .update {
display: block;
float: right;
margin-top: 10px;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-servos .update:hover {
background-color: #dedcdc;
}
.tab-servos .require-support {
display:none;
}

View file

@ -1,4 +1,5 @@
<div class="tab-servos">
<div class="tab-servos toolbar_fixed_bottom">
<div class="content_wrapper">
<div class="require-support">
<div class="title" i18n="servosChangeDirection"></div>
<table class="fields">
@ -18,11 +19,11 @@
<div class="live">
<span i18n="servosLiveMode"></span> <input type="checkbox" />
</div>
<div class="buttons">
<a class="update" href="#" i18n="servosButtonSave"></a>
</div>
</div>
<div class="note require-upgrade" i18n="servosFirmwareUpgradeRequired">
</div>
</div>
</div>
<div class="content_toolbar">
<div class="btn save_btn"><a class="update" href="#" i18n="servosButtonSave"></a></div>
</div>
</div>

View file

@ -74,7 +74,6 @@ margin-bottom:10px;
border: 1px solid silver;
background-color: #ececec;
border-radius: 3px:
z-index: 100;
}
@ -172,31 +171,13 @@ margin-bottom:10px;
.buttons {
bottom: 20px;
}
.update {
display: block;
float: right;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-setup .update:hover {
background-color: #dedcdc;
}
.cell_setup {
border-bottom: solid 1px #ddd;
padding-bottom:8px;
padding-top:7px;
}
@media only screen and (max-width: 1055px), only screen and (max-device-width: 1055px) {
@ -213,9 +194,3 @@ margin-bottom:10px;
}

View file

@ -1,4 +1,5 @@
<div class="tab-setup">
<div class="content_wrapper">
<!-- should be the first DIV on each tab -->
<div class="cf_column full" style="margin-bottom:10px;">
<div class="tab_title" i18n="tabSetup">Setup</div>
@ -126,4 +127,5 @@
</div>
</div>
</div>
</div>
</div>
</div>