From e46a85446305e2d68512e8e42c51da69ad312d88 Mon Sep 17 00:00:00 2001
From: Jens Reidel <jens@troet.org>
Date: Sat, 30 May 2020 05:42:50 +0200
Subject: [PATCH] [matrix] Search to top, icon

* Search bar to top, magnifying glass

* Remove old file

* Remove empty style directive
---
 docs/_static/style.css      |  4 ++--
 docs/_templates/layout.html | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/_static/style.css b/docs/_static/style.css
index bafb9f3c3..65aea916f 100644
--- a/docs/_static/style.css
+++ b/docs/_static/style.css
@@ -271,13 +271,13 @@ aside h3 {
 
 /* search button stuff */
 
-.searchformwrapper > form input {
+.searchformwrapper > form input, button {
   border: 1px solid var(--search-border);
   padding: 0.25em;
   flex-grow: 2;
 }
 
-.searchformwrapper > form input[type="submit"] {
+.searchformwrapper > form button[type="submit"] {
   border-left: none;
   margin-right: 0.5em;
   flex-grow: 8;
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 5c45e7f64..41f0809d4 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -71,8 +71,23 @@
       </div>
       <div id="sidebar">
         {#- This is manually unrolled from the original layout #}
+        <div id="searchbox" role="search">
+          <h3>Quick search</h3>
+          <div class="searchformwrapper">
+            <form class="search" action="search.html" method="get">
+              <input type="text" name="q" />
+              <button type="submit">
+                <i class="fas fa-search"></i>
+              </button>
+              <input type="hidden" name="check_keywords" value="yes" />
+              <input type="hidden" name="area" value="default" />
+            </form>
+          </div>
+        </div>
+        <script type="text/javascript">
+          $("#searchbox").show(0);
+        </script>
         {%- include "localtoc.html" %}
-        {%- include "searchbox.html" %}
       </div>
     </aside>
     {#- The actual body of the contents #}