diff --git a/lib/rdoc/generator/template/aliki/class.rhtml b/lib/rdoc/generator/template/aliki/class.rhtml
index 593b96db22..2f721a5610 100644
--- a/lib/rdoc/generator/template/aliki/class.rhtml
+++ b/lib/rdoc/generator/template/aliki/class.rhtml
@@ -1,4 +1,4 @@
-
+
<%= render '_header.rhtml' %>
<%= render '_sidebar_toggle.rhtml' %>
@@ -41,11 +41,8 @@
<%- if section.title then %>
<%- end %>
@@ -58,7 +55,7 @@
<%- unless constants.empty? then %>
<%- constants.each do |const| %>
@@ -83,7 +80,7 @@
<%- unless attributes.empty? then %>
<%- attributes.each do |attrib| %>
@@ -118,7 +115,7 @@
next if methods.empty? %>
- <%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods
+
<%- methods.each do |method| %>
diff --git a/lib/rdoc/generator/template/aliki/css/rdoc.css b/lib/rdoc/generator/template/aliki/css/rdoc.css
index 1efe3d7089..df79903e90 100644
--- a/lib/rdoc/generator/template/aliki/css/rdoc.css
+++ b/lib/rdoc/generator/template/aliki/css/rdoc.css
@@ -225,35 +225,6 @@ body.has-toc {
}
/* 3. Typography */
-h1 span,
-h2 span,
-h3 span,
-h4 span,
-h5 span,
-h6 span {
- position: relative;
- display: none;
- padding-left: 1em;
- line-height: 0;
- vertical-align: baseline;
- font-size: 10px;
-}
-
-h1 span { top: -1.3em; }
-h2 span { top: -1.2em; }
-h3 span { top: -1.0em; }
-h4 span { top: -0.8em; }
-h5 span { top: -0.5em; }
-h6 span { top: -0.5em; }
-
-h1:hover span,
-h2:hover span,
-h3:hover span,
-h4:hover span,
-h5:hover span,
-h6:hover span {
- display: inline;
-}
/* 4. Links */
a {
@@ -797,6 +768,26 @@ main h5, main h6 {
margin-bottom: var(--space-2);
}
+/* Heading links */
+main h1 a,
+main h2 a,
+main h3 a,
+main h4 a,
+main h5 a,
+main h6 a {
+ color: inherit;
+ text-decoration: none;
+}
+
+main h1 a:hover,
+main h2 a:hover,
+main h3 a:hover,
+main h4 a:hover,
+main h5 a:hover,
+main h6 a:hover {
+ text-decoration: underline;
+}
+
/* Syntax Highlighting - Light Theme */
.ruby-constant { color: var(--code-orange); }
.ruby-keyword { color: var(--code-red); }
@@ -1012,18 +1003,6 @@ main .method-heading .method-args {
font-weight: var(--font-weight-normal);
}
-main .method-heading::after {
- content: '¶';
- position: absolute;
- visibility: hidden;
- color: var(--color-accent-primary);
- font-size: 0.5em;
-}
-
-main .method-heading:hover::after {
- visibility: visible;
-}
-
main .method-controls {
line-height: 20px;
float: right;
diff --git a/lib/rdoc/generator/template/aliki/index.rhtml b/lib/rdoc/generator/template/aliki/index.rhtml
index 1b6051d4d6..b86154a33e 100644
--- a/lib/rdoc/generator/template/aliki/index.rhtml
+++ b/lib/rdoc/generator/template/aliki/index.rhtml
@@ -1,4 +1,4 @@
-
+
<%= render '_header.rhtml' %>
<%= render '_sidebar_toggle.rhtml' %>
diff --git a/lib/rdoc/generator/template/aliki/js/aliki.js b/lib/rdoc/generator/template/aliki/js/aliki.js
index af851900c4..05a3d5e7c1 100644
--- a/lib/rdoc/generator/template/aliki/js/aliki.js
+++ b/lib/rdoc/generator/template/aliki/js/aliki.js
@@ -191,7 +191,7 @@ function generateToc() {
const link = document.createElement('a');
link.href = `#${heading.id}`;
link.className = 'toc-link';
- link.textContent = heading.textContent.replace(/¶.*$/, '').trim(); // Remove pilcrow and "top" links
+ link.textContent = heading.textContent.trim();
link.setAttribute('data-target', heading.id);
li.appendChild(link);
diff --git a/lib/rdoc/generator/template/aliki/page.rhtml b/lib/rdoc/generator/template/aliki/page.rhtml
index 8581cdc0a9..f4a752fe6e 100644
--- a/lib/rdoc/generator/template/aliki/page.rhtml
+++ b/lib/rdoc/generator/template/aliki/page.rhtml
@@ -1,4 +1,4 @@
-
+
<%= render '_header.rhtml' %>
<%= render '_sidebar_toggle.rhtml' %>
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
index a949c53e41..8d019bef46 100644
--- a/lib/rdoc/markup/to_html.rb
+++ b/lib/rdoc/markup/to_html.rb
@@ -312,11 +312,13 @@ def accept_heading(heading)
else
"\n"
end
- @res << to_html(heading.text)
- unless @options.pipe then
- @res << "¶"
- @res << " ↑"
+
+ if @options.pipe
+ @res << to_html(heading.text)
+ else
+ @res << "#{to_html(heading.text)}"
end
+
@res << "\n"
end
diff --git a/test/rdoc/generator/darkfish_test.rb b/test/rdoc/generator/darkfish_test.rb
index cd53d5f56f..1f0236ad8f 100644
--- a/test/rdoc/generator/darkfish_test.rb
+++ b/test/rdoc/generator/darkfish_test.rb
@@ -125,7 +125,7 @@ def test_generate
klassnav
)
- assert_match(/