Merge branch 'master' into match-searchbox

https://github.com/sphinx-doc/sphinx/blob/3.x/sphinx/themes/basic/searchbox.html

.readthedocs.yml

@@ -6,7 +6,6 @@ python:
     - requirements: docs/requirements.txt
     - method: pip
       path: .
-    - requirements: docs/docutils-test.txt
 
 sphinx:
   configuration: docs/conf.py

docs/docutils-test.txt

@@ -1 +0,0 @@
-docutils==0.17

docs/requirements.txt

@@ -1,2 +1,2 @@
-sphinx>=4.0.dev0
+sphinx>=3.0
 sphinxcontrib-httpdomain

sphinx_rtd_theme/layout.html

@@ -174,7 +174,7 @@
     <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
 
       {#- MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" aria-label="{{ _('Top') }}">
+      <nav class="wy-nav-top" aria-label="{{ _('Top') }}" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
         {%- block mobile_nav %}
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
           <a href="{{ pathto(master_doc) }}">{{ project }}</a>

sphinx_rtd_theme/searchbox.html

@@ -1,9 +1,22 @@
-{%- if 'singlehtml' not in builder %}
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-    <input type="text" name="q" placeholder="{{ _('Search docs') }}" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
+{#
+    basic/searchbox.html
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: quick search box.
+
+    :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
+    :license: BSD, see https://github.com/sphinx-doc/sphinx/blob/master/LICENSE for details.
+
+    .. note::
+
+       This file is the same, except the "Go" button was removed and the label is an aria-label.
+#}
+{%- if pagename != "search" and builder != "singlehtml" %}
+<div id="searchbox" role="search">
+  <div class="searchformwrapper">
+    <form class="search" action="{{ pathto('search') }}" method="get">
+      <input aria-label="{{ _('Search docs') }}" type="text" name="q" id="main-search" placeholder="{{ _('Search docs') }}"/>
+    </form>
+  </div>
 </div>
 {%- endif %}