Merge pull request #15881 from meeseeksmachine/auto-backport-of-pr-15859-on-v3.1.x

tacaswell · web-flow · commit 726f9fd95596 · 2019-12-08T15:38:29.000-05:00
Backport PR #15859 on branch v3.1.x (Doc: Move search field into nav bar)
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -1137,7 +1137,7 @@ div.viewcode-block:target {
     border: 1px solid #11557C;
     background: #eff9ff;
     padding: 2px;
-    margin-top: 40px;
+    margin-top: 1em;
 }
 
 .sidebar-announcement p {
@@ -1162,11 +1162,21 @@ nav.main-nav{
     margin: 8px 15px;
     list-style-type: none;
   }
-  
+
   nav.main-nav a{
     color: white;
   }
   
   nav.main-nav a:hover{
     text-decoration: underline;
-  }
+  }
+
+  nav.main-nav li.nav-right{
+    margin: 6px 15px 0 auto;
+  }
+
+  nav.main-nav input {
+    border: 0;
+    padding: 3px 6px;
+    width: 198px;
+  }
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -236,6 +236,11 @@ <h3>{{ _('Navigation') }}</h3>
             <li><a href="{{ pathto('gallery/index') }}">Examples</a></li>
             <li><a href="{{ pathto('tutorials/index') }}">Tutorials</a></li>
             <li><a href="{{ pathto('devel/index') }}">Contributing</a></li>
+            <li class="nav-right">
+                <form class="search" action="search.html" method="get">
+                <input type="text" name="q" aria-labelledby="searchlabel" placeholder="Search"/>
+                </form>
+            </li>
         </ul>
      </nav>
 {%- endblock %}
diff --git a/doc/conf.py b/doc/conf.py
@@ -249,10 +249,8 @@ def _check_dependencies():
 
 # Custom sidebar templates, maps page names to templates.
 html_sidebars = {
-    'index': ['searchbox.html', 'sidebar_announcement.html',
-              'donate_sidebar.html'],
-    '**': ['searchbox.html', 'localtoc.html', 'relations.html',
-           'pagesource.html']
+    'index': ['sidebar_announcement.html', 'donate_sidebar.html'],
+    '**': ['localtoc.html', 'relations.html', 'pagesource.html']
 }
 
 # If false, no module index is generated.
