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

update some libraries, wrestle with yarn/npm, refactor some css

Browse source 
* separate our styling from a libraries included .css
* update npm packages: bluebird, inflection, jbox, jquery, jquery-ui-npm
* ports and osd tabs needed small javascript changes for the above
* refactored CSS style sheets, in summary Cascading was being ignored
* tweaked colors in dark mode.
* tweaked betaflight logo for dark mode care of frozenskys
* dark mode can also trigger on `(prefers-color-scheme: dark)` signal from the OS when NW.js 0.40.0/Chrome 76 is released.
* changed how `gulp-appdmg` is brought in, mixing yarn and npm was causing trouble
* version.json is now written in a more gulpful manner

Note: this works fine with NW.js 0.40.0-beta1
This commit is contained in:
Kyle K 2019-07-04 23:17:54 +00:00
parent 3f899c2300
commit 73fa4f981b
63 changed files with 928 additions and 1981 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/DarkTheme.js
View file

@ -4,7 +4,6 @@ var css_dark = [
'./css/main-dark.css',
'./css/tabs-dark/landing-dark.css',
'./css/tabs-dark/setup-dark.css',
'./css/tabs-dark/setup_osd-dark.css',
'./css/tabs-dark/help-dark.css',
'./css/tabs-dark/ports-dark.css',
'./css/tabs-dark/configuration-dark.css',
@ -25,7 +24,6 @@ var css_dark = [
'./css/tabs-dark/osd-dark.css',
'./css/tabs-dark/power-dark.css',
'./css/tabs-dark/transponder-dark.css',
'./js/libraries/jbox/jBox-dark.css',
]
var DarkTheme = {
@ -54,4 +52,4 @@ DarkTheme.applyNormal = function() {
for (var i = 0; i < css_dark.length; i++) {
$('link[href="' + css_dark[i] + '"]').prop('disabled', true);
}
};
};

6
src/js/tabs/osd.js
View file

@ -2086,8 +2086,8 @@ TABS.osd.initialize = function (callback) {
// Open modal window
OSD.GUI.fontManager = new jBox('Modal', {
width: 720,
height: 440,
width: 750,
height: 455,
closeButton: 'title',
animation: false,
attach: $('#fontmanager'),
@ -2195,7 +2195,7 @@ TABS.osd.initialize = function (callback) {
var alarm = OSD.data.alarms[k];
var alarmInput = $('<input name="alarm" type="number" id="' + k + '"/>' + alarm.display_name + '</label>');
alarmInput.val(alarm.value);
alarmInput.blur(function (e) {
alarmInput.focusout(function (e) {
OSD.data.alarms[$(this)[0].id].value = $(this)[0].value;
MSP.promise(MSPCodes.MSP_SET_OSD_CONFIG, OSD.msp.encodeOther())
.then(function () {

2
src/js/tabs/ports.js
View file

@ -243,7 +243,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
var selectElementSelector = 'select[name=' + selectElementName + ']';
select_e = functions_e.find(selectElementSelector);
if (select_e.size() == 0) {
if (select_e.length == 0) {
functions_e.prepend('<span class="function"><select name="' + selectElementName + '" /></span>');
select_e = functions_e.find(selectElementSelector);
var disabledText = i18n.getMessage('portsTelemetryDisabled');