Fix CSS

betaflight · Feb 8, 2023 · 4ac9baa · 4ac9baa
1 parent 48e6abb
commit 4ac9baa
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/src/css/tabs/gps.less b/src/css/tabs/gps.less
@@ -40,7 +40,8 @@
 	.gps_map {
 		height: 460px;
 	}
-	.gps {
+	.gps_config {
+		font-size: 11px;
 		.line {
 			clear: left;
 		}
@@ -74,12 +75,6 @@
 			}
 		}
 	}
-	.featuresMultiple {
-		border-collapse: collapse;
-		margin-bottom: 5px;
-		margin-top: -5px;
-		padding: 0;
-	}
 	dl.features {
 		dt {
 			float: left;

diff --git a/src/js/Features.js b/src/js/Features.js
@@ -37,7 +37,7 @@ const Features = function (config) {
         );
     }
 
-    self._features = features;
+    self._features = features.sort((a, b) => a.name.localeCompare(b.name, window.navigator.language, { ignorePunctuation: true }));
     self._featureMask = 0;
 
     self._analyticsChanges = {};

diff --git a/src/js/tabs/configuration.js b/src/js/tabs/configuration.js
@@ -349,6 +349,25 @@ configuration.initialize = function (callback) {
 
         // UI hooks
 
+        function checkUpdateGpsControls() {
+            if (FC.FEATURE_CONFIG.features.isEnabled('GPS')) {
+                $('.gpsSettings').show();
+            } else {
+                $('.gpsSettings').hide();
+            }
+        }
+
+        $('input.feature', features_e).change(function () {
+            const element = $(this);
+
+            FC.FEATURE_CONFIG.features.updateData(element);
+            updateTabList(FC.FEATURE_CONFIG.features);
+
+            if (element.attr('name') === 'GPS') {
+                checkUpdateGpsControls();
+            }
+        });
+
         $('input[id="accHardwareSwitch"]').change(function() {
             const checked = $(this).is(':checked');
             $('.accelNeeded').toggle(checked);
@@ -366,6 +385,8 @@ configuration.initialize = function (callback) {
             FC.BEEPER_CONFIG.beepers.updateData(element);
         });
 
+        checkUpdateGpsControls();
+
         $('a.save').on('click', function() {
             // gather data that doesn't have automatic change event bound
             FC.BOARD_ALIGNMENT_CONFIG.roll = parseInt($('input[name="board_align_roll"]').val());

diff --git a/src/tabs/configuration.html b/src/tabs/configuration.html
@@ -135,7 +135,7 @@
                                         <th i18n="configurationFeatureName"></th>
                                     </tr>
                                 </thead>
-                                <tbody class="features other" id="noline">
+                                <tbody class="features gps other" id="noline">
                                     <!-- table generated here -->
                                 </tbody>
                             </table>

diff --git a/src/tabs/gps.html b/src/tabs/gps.html
@@ -13,12 +13,7 @@
                         <div class="spacer_box_title" i18n="configurationGPS"></div>
                     </div>
                     <div class="spacer_box">
-                        <table class="featuresMultiple">
-                            <tbody class="features gps">
-                                <!-- table generated here -->
-                            </tbody>
-                        </table>
-                        <div class="gpsSettings">
+                        <div class="gps_config">
                             <div style="float:left; width:100%;">
                                 <div class="select line">
                                     <select class="gps_protocol">