From 826930e7c2d87dbb2dd56f706983c5b00023cae8 Mon Sep 17 00:00:00 2001
From: Jonathan Hefner <jonathan@hefner.pro>
Date: Tue, 10 Oct 2023 11:38:39 -0500
Subject: [PATCH 1/3] Add Outline heading in panel

---
 .../generator/template/rails/_file_nav.rhtml  |  1 +
 .../generator/template/rails/_index_nav.rhtml |  1 +
 .../template/rails/_module_nav.rhtml          |  1 +
 .../template/rails/resources/css/main.css     | 21 +++++++++----------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/rdoc/generator/template/rails/_file_nav.rhtml b/lib/rdoc/generator/template/rails/_file_nav.rhtml
index e91ba3aa..737c9165 100644
--- a/lib/rdoc/generator/template/rails/_file_nav.rhtml
+++ b/lib/rdoc/generator/template/rails/_file_nav.rhtml
@@ -1,4 +1,5 @@
 <% if @context.text? %>
+  <div class="nav__heading">Outline</div>
   <div class="nav__outline">
     <%= outline(@context) %>
   </div>
diff --git a/lib/rdoc/generator/template/rails/_index_nav.rhtml b/lib/rdoc/generator/template/rails/_index_nav.rhtml
index 5e335ee5..585d73c8 100644
--- a/lib/rdoc/generator/template/rails/_index_nav.rhtml
+++ b/lib/rdoc/generator/template/rails/_index_nav.rhtml
@@ -1,3 +1,4 @@
+<div class="nav__heading">Outline</div>
 <div class="nav__outline">
   <%= outline(@context) %>
 </div>
diff --git a/lib/rdoc/generator/template/rails/_module_nav.rhtml b/lib/rdoc/generator/template/rails/_module_nav.rhtml
index b9870238..cb6bf84f 100644
--- a/lib/rdoc/generator/template/rails/_module_nav.rhtml
+++ b/lib/rdoc/generator/template/rails/_module_nav.rhtml
@@ -1,6 +1,7 @@
 <%= button_to_search @context, display_name: short_name(@context) %>
 
 <% if outline = outline(@context) %>
+  <div class="nav__heading">Outline</div>
   <div class="nav__outline">
     <%= outline %>
   </div>
diff --git a/lib/rdoc/generator/template/rails/resources/css/main.css b/lib/rdoc/generator/template/rails/resources/css/main.css
index 4a47dd18..2df32b19 100644
--- a/lib/rdoc/generator/template/rails/resources/css/main.css
+++ b/lib/rdoc/generator/template/rails/resources/css/main.css
@@ -410,10 +410,19 @@ html {
 }
 
 
-* + .nav__outline {
+.nav__heading {
+  font-size: 1.3em;
+}
+
+* + .nav__heading {
   margin-top: var(--space-lg);
 }
 
+.nav__heading + * {
+  margin-top: var(--space-sm);
+}
+
+
 .nav__outline ul {
   margin-top: var(--space-sm);
   padding-left: 1em;
@@ -432,16 +441,6 @@ html {
 }
 
 
-.nav__heading {
-  margin-top: var(--space-lg);
-  font-size: 1.3em;
-}
-
-.nav__heading + .nav__list {
-  margin-top: var(--space-sm);
-}
-
-
 .nav__list {
   padding: 0;
   list-style: none;

From a0d20c9dcef1a6463d135734cf49afbd87666d12 Mon Sep 17 00:00:00 2001
From: Jonathan Hefner <jonathan@hefner.pro>
Date: Tue, 10 Oct 2023 12:09:14 -0500
Subject: [PATCH 2/3] Add Namespace link in panel

The `list.svg` file is from [Feather icons][feather] v4.29.0, and is
[licensed under the MIT license][license].

[feather]: https://feathericons.com/
[license]: https://github.com/feathericons/feather/blob/v4.29.0/LICENSE
---
 .../generator/template/rails/_context.rhtml   |  2 +-
 .../template/rails/_module_nav.rhtml          |  3 ++
 .../template/rails/resources/css/main.css     | 29 ++++++++++++++-----
 .../template/rails/resources/i/list.svg       |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 lib/rdoc/generator/template/rails/resources/i/list.svg

diff --git a/lib/rdoc/generator/template/rails/_context.rhtml b/lib/rdoc/generator/template/rails/_context.rhtml
index dce4c3e8..2e8a0da4 100644
--- a/lib/rdoc/generator/template/rails/_context.rhtml
+++ b/lib/rdoc/generator/template/rails/_context.rhtml
@@ -156,7 +156,7 @@
 
   <% unless @context.classes_and_modules.empty? %>
     <!-- Namespace -->
-    <div class="content__divider">Namespace</div>
+    <div id="namespace" class="content__divider">Namespace</div>
     <ul>
       <% (@context.modules.sort + @context.classes.sort).each do |mod| %>
         <li>
diff --git a/lib/rdoc/generator/template/rails/_module_nav.rhtml b/lib/rdoc/generator/template/rails/_module_nav.rhtml
index cb6bf84f..733d4c76 100644
--- a/lib/rdoc/generator/template/rails/_module_nav.rhtml
+++ b/lib/rdoc/generator/template/rails/_module_nav.rhtml
@@ -1,3 +1,6 @@
+<% unless @context.classes_and_modules.empty? %>
+  <a href="#namespace" class="namespace-link"><%= short_name(@context) %> namespace</a>
+<% end %>
 <%= button_to_search @context, display_name: short_name(@context) %>
 
 <% if outline = outline(@context) %>
diff --git a/lib/rdoc/generator/template/rails/resources/css/main.css b/lib/rdoc/generator/template/rails/resources/css/main.css
index 2df32b19..d1b0472b 100644
--- a/lib/rdoc/generator/template/rails/resources/css/main.css
+++ b/lib/rdoc/generator/template/rails/resources/css/main.css
@@ -74,14 +74,7 @@ a:has(> code):not(:has(> :not(code))) {
   text-align: left;
   font-family: inherit;
   font-size: 1em;
-
-  background: url('../i/filter.svg') no-repeat;
-  background-position-y: 1px;
-  background-size: 1.1em;
-  padding: 0 0 0 1.3em;
   color: var(--link-color);
-
-  word-break: break-word;
 }
 
 @media (hover: hover) {
@@ -461,6 +454,28 @@ html {
 }
 
 
+.panel__nav :is(.namespace-link, .query-button) {
+  display: block;
+  word-break: break-word;
+}
+
+.panel__nav .namespace-link {
+  background: url('../i/list.svg') no-repeat;
+  background-position-y: 1px;
+  background-size: 1.1em;
+  padding: 0 0 0 1.3em;
+
+  text-decoration: none;
+}
+
+.panel__nav .query-button {
+  background: url('../i/filter.svg') no-repeat;
+  background-position-y: 1px;
+  background-size: 1.1em;
+  padding: 0 0 0 1.3em;
+}
+
+
 /*
  * Navigation panel on desktop
  */
diff --git a/lib/rdoc/generator/template/rails/resources/i/list.svg b/lib/rdoc/generator/template/rails/resources/i/list.svg
new file mode 100644
index 00000000..c62a09de
--- /dev/null
+++ b/lib/rdoc/generator/template/rails/resources/i/list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="#777777" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-list"><line x1="8" y1="6" x2="21" y2="6"></line><line x1="8" y1="12" x2="21" y2="12"></line><line x1="8" y1="18" x2="21" y2="18"></line><line x1="3" y1="6" x2="3.01" y2="6"></line><line x1="3" y1="12" x2="3.01" y2="12"></line><line x1="3" y1="18" x2="3.01" y2="18"></line></svg>

From 2c82df97feda85fbd20e0f4fc64125c8c1d26f65 Mon Sep 17 00:00:00 2001
From: Jonathan Hefner <jonathan@hefner.pro>
Date: Tue, 10 Oct 2023 12:21:58 -0500
Subject: [PATCH 3/3] Sort Namespace list by name only

This makes it easier to scan the Namespace list when looking for an
approximate name.
---
 lib/rdoc/generator/template/rails/_context.rhtml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/rdoc/generator/template/rails/_context.rhtml b/lib/rdoc/generator/template/rails/_context.rhtml
index 2e8a0da4..005069ee 100644
--- a/lib/rdoc/generator/template/rails/_context.rhtml
+++ b/lib/rdoc/generator/template/rails/_context.rhtml
@@ -158,11 +158,8 @@
     <!-- Namespace -->
     <div id="namespace" class="content__divider">Namespace</div>
     <ul>
-      <% (@context.modules.sort + @context.classes.sort).each do |mod| %>
-        <li>
-          <span class="kind"><%= mod.type %></span>
-          <%= link_to mod %>
-        </li>
+      <% @context.classes_and_modules.sort.each do |mod| %>
+        <li><%= link_to mod %></li>
       <% end %>
     </ul>
   <% end %>