Several fixes

* Ensure h1 has a minimal height * Ensure the whole background is either black or white * Remove additional padding under keyboard shortcuts * Remove duplication on search template
elixir-lang · Jan 11, 2022 · 454e1ae · 454e1ae
1 parent 13664d9
commit 454e1ae
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 32 deletions.
diff --git a/assets/js/handlebars/templates/search-results.handlebars b/assets/js/handlebars/templates/search-results.handlebars
@@ -1,20 +1,15 @@
-{{#if value}}
-  <h1>
+<h1>
+  {{#if value}}
     Search results for <em>{{value}}</em>
-    <button class="settings display-settings">
-      <i class="ri-settings-3-line"></i>
-      <span class="sr-only">Settings</span>
-    </button>
-  </h1>
-{{else}}
-  <h1 id="content">
+  {{else}}
     Invalid Search
-    <button class="settings display-settings">
-      <i class="ri-settings-3-line"></i>
-      <span class="sr-only">Settings</span>
-    </button>
-  </h1>
-{{/if}}
+  {{/if}}
+
+  <button class="settings display-settings">
+    <i class="ri-settings-3-line"></i>
+    <span class="sr-only">Settings</span>
+  </button>
+</h1>
 
 {{#isNonEmptyArray results}}
   {{#each results}}

diff --git a/assets/js/settings.js b/assets/js/settings.js
@@ -18,7 +18,7 @@ const modalTabs = [
     id: 'modal-settings-tab'
   },
   {
-    title: 'Keyboard Shortcuts',
+    title: 'Keyboard shortcuts',
     id: 'modal-keyboard-shortcuts-tab'
   }
 ]

diff --git a/assets/less/content/general.less b/assets/less/content/general.less
@@ -14,6 +14,7 @@ h6 {
 h1 {
   font-size: 2em;
   margin: 1em 0 .5em;
+  min-height: 30px;
 
   &.signature {
     margin: 0;

diff --git a/assets/less/keyboard-shortcuts.less b/assets/less/keyboard-shortcuts.less
@@ -7,6 +7,10 @@
     padding: 6px 0;
   }
 
+  dl.shortcut-row:first-child {
+    padding-top: 0;
+  }
+
   .shortcut-keys {
     display: inline-block;
   }

diff --git a/assets/less/layout.less b/assets/less/layout.less
@@ -6,7 +6,7 @@ body {
 }
 
 body {
-  background-color: @offWhite;
+  background-color: @white;
   color: @black;
   font-size: 16px;
   font-family: @sansFontFamily;
@@ -172,7 +172,6 @@ body.sidebar-closed .sidebar {
 }
 
 .content-outer {
-  background-color: @white;
   min-height: 100%;
 }
 

diff --git a/assets/less/modal.less b/assets/less/modal.less
@@ -47,7 +47,7 @@
   .modal-title {
     display: inline-block;
     flex-grow: 1;
-    font-size: 1.3rem;
+    font-size: 1.2rem;
     font-weight: bold;
     margin-bottom: 20px;
 

diff --git a/assets/less/night/night.less b/assets/less/night/night.less
@@ -1,10 +1,6 @@
 body.night-mode {
   background: @nightBackground;
 
-  .content-outer {
-    background: @nightBackground;
-  }
-
   .night-mode-toggle .icon-theme::before {
     content: "\e901";
   }

diff --git a/assets/less/variables/common.less b/assets/less/variables/common.less
@@ -10,7 +10,6 @@
 @yellow: #ffffdd;
 @deprecated: #ffff9d;
 @darkDeprecated: #dcc100;
-@offWhite: #E5E5E5;
 
 // Light mode
 @darkGrayTextHeaders: #0D1829; // gray 800

diff --git a/...ers/html/dist/app-19649313641840c1ad7a.js → ...ers/html/dist/app-973561a99a0985d496b3.js b/...ers/html/dist/app-19649313641840c1ad7a.js → ...ers/html/dist/app-973561a99a0985d496b3.js
diff --git a/...t/app-19649313641840c1ad7a.js.LICENSE.txt → ...t/app-973561a99a0985d496b3.js.LICENSE.txt b/...t/app-19649313641840c1ad7a.js.LICENSE.txt → ...t/app-973561a99a0985d496b3.js.LICENSE.txt
diff --git a/formatters/html/dist/elixir-80d4603576b77cca433d.css b/formatters/html/dist/elixir-80d4603576b77cca433d.css
diff --git a/formatters/html/dist/elixir-925acc81db1bc46f1558.css b/formatters/html/dist/elixir-925acc81db1bc46f1558.css
diff --git a/formatters/html/dist/erlang-0a9ce46b606f84f0a0ba.css b/formatters/html/dist/erlang-0a9ce46b606f84f0a0ba.css
diff --git a/formatters/html/dist/erlang-d0a1de5e2f9743ebbcf5.css b/formatters/html/dist/erlang-d0a1de5e2f9743ebbcf5.css
diff --git a/lib/ex_doc/formatter/html/templates/search_template.eex b/lib/ex_doc/formatter/html/templates/search_template.eex
@@ -1,5 +1,6 @@
 <%= head_template(config, %{title: "Search", type: :search}) %>
 <%= sidebar_template(config, nodes_map) %>
+
 <div id="search">
   <h1 id="content">
     Page not found

diff --git a/lib/ex_doc/formatter/html/templates/settings_button_template.eex b/lib/ex_doc/formatter/html/templates/settings_button_template.eex
@@ -1,4 +1,4 @@
 <button class="settings display-settings">
-    <i class="ri-settings-3-line"></i>
-    <span class="sr-only">Settings</span>
+  <i class="ri-settings-3-line"></i>
+  <span class="sr-only">Settings</span>
 </button>