Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-19 22:35:17 +03:00
Code Issues Wiki Activity

Some finetuning

Browse source
This commit is contained in:
skaman82 2015-10-28 17:39:33 +01:00
parent 271eefe5fa
commit 770cae9ee4
5 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

52
main.css
View file

@ -14,7 +14,7 @@ body {
font-family: 'open_sansregular', 'Segoe UI', Tahoma, sans-serif; font-family: 'open_sansregular', 'Segoe UI', Tahoma, sans-serif;
font-size: 12px; font-size: 12px;
color: #303030; color: #303030;
background-color:#3f4140; background-color:#3d3f3e;
margin:0px; margin:0px;
padding:0px; padding:0px;
} }
@ -471,8 +471,8 @@ color:#ddd;
*/ */
#options { #options {
float: right; float: right;
width: 25px; width: 20px;
height: 25px; height: 20px;
margin-top:10px; margin-top:10px;
margin-right:10px; margin-right:10px;
background-image: url('./images/CF_settings_white.svg'); background-image: url('./images/CF_settings_white.svg');
@ -597,8 +597,9 @@ margin-right:20px;
.tab_container { .tab_container {
float:left; float:left;
height:calc(100% - 150px); height:calc(100% - 150px);
width:210px; width:200px;
border-right: 4px solid #59aa29; border-right: 4px solid #59aa29;
background-color: #2e2e2e;
} }
@ -621,10 +622,22 @@ margin-right:20px;
margin-top:0px; margin-top:0px;
overflow: hidden; overflow: hidden;
width:100%; width:100%;
overflow-y: scroll; /* scroll*/
/* Cause the height to expand to contain its floated contents */
} }
#tabs.logopen ul {
height:calc(100% - 65px);
float:left;
margin-top:0px;
overflow: hidden;
width:100%;
overflow-y: scroll; /* scroll*/
/* Cause the height to shrink to contain its floated contents while log is open */
}
#tabs ul.mode-connected { #tabs ul.mode-connected {
display: none; display: none;
} }
@ -900,6 +913,7 @@ li.active .ic_mission {
border: 0px solid #848484; /* 1px solid #848484; */ border: 0px solid #848484; /* 1px solid #848484; */
-webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */ -webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */
transition: all 1.3s; transition: all 1.3s;
/* Cause the height to shrink to contain its floated contents while log is open */
} }
@ -959,10 +973,8 @@ dialog {
/* Tab Title */ /* Tab Title */
.tab_title { .tab_title {
float:left; float:left;
width:100%; width:100%;
border-bottom:1px solid #59aa29; border-bottom:1px solid #59aa29;
@ -1121,16 +1133,16 @@ dialog {
/* Fixed area at the Bottom */ /* Fixed area at the Bottom */
.fixed_band { .fixed_band {
position: ; position: relative;
height: 50px; height: 50px;
background-color:#e4e4e4; background-color:#e4e4e4;
width:100%; width:calc(100% + 40px);
margin-left:0px; margin-left:-20px;
box-shadow:rgba(0,0,0,0.20) 0 -3px 8px ; box-shadow:rgba(0,0,0,0.00) 0 -3px 8px ;
z-index:1000; bottom:0px;
float:left;
margin-top:0px;
margin-bottom:0px; margin-bottom:0px;
} }
@ -1139,10 +1151,10 @@ dialog {
/* line-height:20px; /* line-height:20px;
padding:3px 13px 5px 13px; padding:3px 13px 5px 13px;
*/ */
margin-top: 10px; margin-top: 9px;
margin-bottom: 10px; margin-bottom: 0px;
margin-right:15px; margin-right:20px;
background-color:#59aa29; background-color:#59aa29;
border-radius:3px; border-radius:3px;
border: 1px solid #4c8829; border: 1px solid #4c8829;
@ -1154,7 +1166,7 @@ dialog {
display:block; display:block;
cursor:pointer; cursor:pointer;
transition: all ease 0.2s; transition: all ease 0.2s;
padding:5px; padding:0px;
padding-left:9px; padding-left:9px;
padding-right:9px; padding-right:9px;
@ -1396,6 +1408,8 @@ background-color:#e60000;
padding:20px; padding:20px;
float:left; float:left;
width:calc(100% - 40px); width:calc(100% - 40px);
height:calc(100% - 40px) !important;
position:absolute !important;
} }

3
main.js
View file

@ -379,7 +379,7 @@ $("#showlog").on('click', function() {
$("#log").animate({height: 27}, 800); $("#log").animate({height: 27}, 800);
$("#log").removeClass('active'); $("#log").removeClass('active');
$("#content").removeClass('logopen'); $("#content").removeClass('logopen');
$("#tabs").removeClass('logopen');
$("#scrollicon").removeClass('active'); $("#scrollicon").removeClass('active');
state = false; state = false;
@ -387,6 +387,7 @@ $("#showlog").on('click', function() {
$("#log").animate({height: 111}, 800); $("#log").animate({height: 111}, 800);
$("#log").addClass('active'); $("#log").addClass('active');
$("#content").addClass('logopen'); $("#content").addClass('logopen');
$("#tabs").addClass('logopen');
$("#scrollicon").addClass('active'); $("#scrollicon").addClass('active');
state = true; state = true;

4
styles/dropdown-lists/css/style_lists.css
View file

@ -119,7 +119,9 @@
} }
.dropdown-dark { .dropdown-dark {
background: #636363; background: #636363; /* NEW2 */
background: #3e403f; /* NEW */
border-color: #111 #0a0a0a black; border-color: #111 #0a0a0a black;
background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4)); background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));
background-image: -moz-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4)); background-image: -moz-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));

8
tabs/configuration.html
View file

@ -325,13 +325,13 @@
<div class="fixed_band"><div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a>
</div></div>
</div> </div>
<div class="fixed_band"><div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a>
</div></div>

7
tabs/ports.html
View file

@ -29,11 +29,14 @@
</div> </div>
<div class="fixed_band"><div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a>
</div></div>
</div> </div>
<div class="fixed_band"><div class="save_btn"><a class="save" href="#" i18n="configurationButtonSave"></a>
</div></div>
<div id="tab-ports-templates"> <div id="tab-ports-templates">