From 722b79d9be07fe3b86a2e6a59af46593599d4884 Mon Sep 17 00:00:00 2001
From: Albina <51043550+albinazs@users.noreply.github.com>
Date: Tue, 24 Sep 2024 12:58:23 +0300
Subject: [PATCH] Fix minimap toggle visibility (#12279)

Co-authored-by: Thibaud Colas <thibaudcolas@gmail.com>
---
 CHANGELOG.txt                                 |  1 +
 .../src/components/Minimap/CollapseAll.scss   |  4 ++--
 client/src/components/Minimap/Minimap.scss    | 24 +------------------
 docs/releases/6.3.md                          |  1 +
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7a88df0291df..64acc385cd28 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,6 +28,7 @@ Changelog
  * Fix: Remove wrongly-added filters from redirects index (Matt Westcott)
  * Fix: Prevent popular tags filter from generating overly complex queries when not filtering (Matt Westcott)
  * Fix: Fix content path links in usage view to scroll to the correct element (Sage Abdullah)
+ * Fix: Always show the minimap toggle button (Albina Starykova)
  * Docs: Upgrade Sphinx to 7.3 (Matt Westcott)
  * Docs: Document how to customize date/time format settings (Vince Salvino)
  * Docs: Create a new documentation section for deployment and move fly.io deployment from the tutorial to this section (Vince Salvino)
diff --git a/client/src/components/Minimap/CollapseAll.scss b/client/src/components/Minimap/CollapseAll.scss
index 0ef826383ba6..e5da4e8687bb 100644
--- a/client/src/components/Minimap/CollapseAll.scss
+++ b/client/src/components/Minimap/CollapseAll.scss
@@ -31,8 +31,8 @@
     position: absolute;
     top: $minimap-top-offset;
     inset-inline-end: 0;
-    margin-top: theme('spacing.3');
-    margin-inline-end: theme('spacing.3');
+    margin-top: theme('spacing.5');
+    margin-inline-end: theme('spacing.10');
 
     .side-panel-open & {
       inset-inline-end: var(--side-panel-width, 0);
diff --git a/client/src/components/Minimap/Minimap.scss b/client/src/components/Minimap/Minimap.scss
index 1519a7ceccd1..b15c90995f9b 100644
--- a/client/src/components/Minimap/Minimap.scss
+++ b/client/src/components/Minimap/Minimap.scss
@@ -53,30 +53,10 @@ $minimap-z-index: calc(theme('zIndex.header') - 20);
   background-color: theme('colors.surface-page');
   color: theme('colors.icon-primary');
   transform: rotate(180deg);
-  // Expand is available for keyboard users only.
-  opacity: 0;
-  pointer-events: none;
 
   @include media-breakpoint-up(sm) {
-    margin-top: theme('spacing.9');
+    margin-top: 18px;
     padding: theme('spacing.[1.5]');
-
-    *:focus {
-      opacity: 1;
-      pointer-events: auto;
-    }
-
-    // Ensure the toggle button is only visible when it has **focus-visible**.
-    // With fallback focus styles for browsers that lack focus-visible support.
-    *:focus:not(:focus-visible) {
-      opacity: 0;
-      pointer-events: none;
-    }
-
-    &:focus-visible {
-      opacity: 1;
-      pointer-events: auto;
-    }
   }
 
   .icon {
@@ -85,8 +65,6 @@ $minimap-z-index: calc(theme('zIndex.header') - 20);
   }
 
   :where(.w-minimap--expanded) & {
-    opacity: 1;
-    pointer-events: auto;
     margin-top: theme('spacing.3');
     margin-inline-start: theme('spacing.3');
     padding: theme('spacing.3');
diff --git a/docs/releases/6.3.md b/docs/releases/6.3.md
index c58289ef1a62..37c696301174 100644
--- a/docs/releases/6.3.md
+++ b/docs/releases/6.3.md
@@ -43,6 +43,7 @@ This release adds formal support for Django 5.1.
  * Remove wrongly-added filters from redirects index (Matt Westcott)
  * Prevent popular tags filter from generating overly complex queries when not filtering (Matt Westcott)
  * Fix content path links in usage view to scroll to the correct element (Sage Abdullah)
+ * Always show the minimap toggle button (Albina Starykova)
 
 ### Documentation