Merge pull request #18308 from win20/navigation-panel-settings-icon-issues

Fix issues with settings icon in nav panel

libraries/classes/Controllers/Preferences/TwoFactorController.php

@@ -73,5 +73,11 @@ class TwoFactorController extends AbstractController
             'backends' => $twoFactor->getAllBackends(),
             'missing' => $twoFactor->getMissingDeps(),
         ]);
+
+        if ($this->response->isAjax()) {
+            $this->response->addJSON('disableNaviSettings', true);
+        } else {
+            define('PMA_DISABLE_NAVI_SETTINGS', true);
+        }
     }
 }

themes/bootstrap/scss/_common.scss

@@ -884,7 +884,7 @@ textarea#partitiondefinition {
 
 // for elements that should be revealed only via js
 .hide {
-  display: none;
+  display: none !important;
 }
 
 #list_server {