From a067418124c5f710b853bc3648983fecc2a221ba Mon Sep 17 00:00:00 2001
From: Win Barua <win.barua2@gmail.com>
Date: Sat, 1 Apr 2023 14:47:50 +0100
Subject: [PATCH] Fix issues with settings icon in nav panel

- settings icon still shows in 2FA in all themes.
- bootstrap theme still shows settings icon on all settings tabs.

Signed-off-by: Win Barua <win.barua2@gmail.com>
---
 .../classes/Controllers/Preferences/TwoFactorController.php | 6 ++++++
 themes/bootstrap/scss/_common.scss                          | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php
index ccd7ea6638..f57e48fb73 100644
--- a/libraries/classes/Controllers/Preferences/TwoFactorController.php
+++ b/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);
+        }
     }
 }
diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss
index 24880446bd..c544d6579e 100644
--- a/themes/bootstrap/scss/_common.scss
+++ b/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 {