Merge pull request #336 from jonathanhefner/hotwire-fonts

Use fonts from Hotwire documentation

CHANGELOG.md

@@ -24,7 +24,7 @@ Main (3.0.0.alpha)
 * [#268](https://github.com/rails/sdoc/pull/268) Add initial dark mode support [@p8](https://github.com/p8)
 * [#279](https://github.com/rails/sdoc/pull/279) Redesign "Appears in" file list [@jonathanhefner](https://github.com/jonathanhefner)
 * [#280](https://github.com/rails/sdoc/pull/280) Redesign banner and mobile menu bar [@jonathanhefner](https://github.com/jonathanhefner)
-* [#283](https://github.com/rails/sdoc/pull/283) Rework typography [@jonathanhefner](https://github.com/jonathanhefner)
+* [#283](https://github.com/rails/sdoc/pull/283), [#336](https://github.com/rails/sdoc/pull/336) Rework typography [@jonathanhefner](https://github.com/jonathanhefner)
 * [#286](https://github.com/rails/sdoc/pull/286) Render breadcrumb links for module's parents [@jonathanhefner](https://github.com/jonathanhefner)
 * [#287](https://github.com/rails/sdoc/pull/287) Generate uniform `<h1>` headings for all modules [@jonathanhefner](https://github.com/jonathanhefner)
 * [#291](https://github.com/rails/sdoc/pull/291) Remove keyboard shortcuts that use meta keys [@jonathanhefner](https://github.com/jonathanhefner)

config.ru

@@ -16,7 +16,7 @@ unless Dir.exist?(root)
 end
 
 use Rack::Static,
-  :urls => ["/files", "/images", "/js", "/css", "/panel", "/i", "/classes", "/ruby", "/rails"],
+  :urls => ["/files", "/images", "/js", "/css", "/panel", "/i", "/fonts", "/classes", "/ruby", "/rails"],
   :root => root
 run lambda { |env|
   [

lib/rdoc/generator/template/rails/_context.rhtml

@@ -8,7 +8,7 @@
 
   <%# File only: requires %>
   <% unless @context.requires.empty? %>
-    <div class="content__divider">Required Files</div>
+    <h2 class="content__divider">Required Files</h2>
     <ul>
       <% @context.requires.each do |req| %>
         <li><%= full_name req.name %></li>
@@ -19,7 +19,7 @@
 
   <%# Module only: ancestors %>
   <% unless @context.is_a?(RDoc::TopLevel) || (ancestors = module_ancestors(@context)).empty? %>
-    <div class="content__divider">Inherits From</div>
+    <h2 class="content__divider">Inherits From</h2>
     <ul>
       <% ancestors.each do |kind, ancestor| %>
         <li>
@@ -34,7 +34,7 @@
   <% sections = @context.sections.select { |s| s.title }.sort_by{ |s| s.title.to_s } %>
   <% unless sections.empty? then %>
     <!-- Sections -->
-    <div class="content__divider">Sections</div>
+    <h2 class="content__divider">Sections</h2>
     <ul>
       <% sections.each do |section| %>
         <li><%= link_to h(section.title), "##{section.aref}" %></li>
@@ -156,7 +156,7 @@
 
   <% unless @context.classes_and_modules.empty? %>
     <!-- Namespace -->
-    <div id="namespace" class="content__divider">Namespace</div>
+    <h2 id="namespace" class="content__divider">Namespace</h2>
     <ul>
       <% @context.classes_and_modules.sort.each do |mod| %>
         <li><%= link_to mod %></li>

lib/rdoc/generator/template/rails/_file_nav.rhtml

@@ -4,9 +4,7 @@
     <%= outline(@context) %>
   </div>
 <% else %>
-  <ul class="nav__list">
-    <% @context.each_classmodule do |rdoc_module| %>
-      <li><%= button_to_search rdoc_module %></li>
-    <% end %>
-  </ul>
+  <% @context.each_classmodule do |rdoc_module| %>
+    <%= button_to_search rdoc_module %>
+  <% end %>
 <% end %>

lib/rdoc/generator/template/rails/_head.rhtml

@@ -1,5 +1,11 @@
 <%= base_tag_for_context(@context) %>
 
+<link rel="preload" href="/fonts/Bitter-Roman.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="/fonts/Bitter-Italic.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="/fonts/Jost-Roman.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="/fonts/Jost-Italic.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="/fonts/RobotoMono-Roman.woff2" as="font" type="font/woff2" crossorigin>
+
 <link rel="stylesheet" href="/css/main.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="/css/highlight.css" type="text/css" media="screen" />
 

lib/rdoc/generator/template/rails/_module_nav.rhtml

@@ -15,7 +15,7 @@
   <ul class="nav__list">
     <% methods.each do |rdoc_method| %>
       <li><%= link_to short_name(rdoc_method), rdoc_method,
-                class: "nav__method-link#{"--singleton" if rdoc_method.singleton}" %></li>
+                class: "ref-link nav__method-link#{"--singleton" if rdoc_method.singleton}" %></li>
     <% end %>
   </ul>
 <% end %>

lib/rdoc/generator/template/rails/class.rhtml

@@ -22,7 +22,7 @@
 
         <% inline "_context.rhtml" %>
 
-        <div class="content__divider">Definition files</div>
+        <h2 class="content__divider">Definition files</h2>
         <%= more_less_ul @context.in_files.map { |file| link_to file }, 5..9 %>
     </main>
   </body>