Merge branch '1.8' into 5325_latex_broken_xref

CHANGES

@@ -16,6 +16,7 @@ Features added
 Bugs fixed
 ----------
 
+* html: search box overrides to other elements if scrolled
 * #5325: latex: cross references has been broken by multiply labeled objects
 
 Testing

sphinx/ext/graphviz.py

@@ -156,9 +156,7 @@ class Graphviz(SphinxDirective):
                     line=self.lineno)]
         node = graphviz()
         node['code'] = dotcode
-        node['options'] = {
-            'docname': path.splitext(self.state.document.current_source)[0],
-        }
+        node['options'] = {'docname': self.env.docname}
 
         if 'graphviz_dot' in self.options:
             node['options']['graphviz_dot'] = self.options['graphviz_dot']

sphinx/themes/basic/static/basic.css_t

@@ -81,6 +81,10 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
+div.sphinxsidebar #searchbox form.search {
+    overflow: hidden;
+}
+
 div.sphinxsidebar #searchbox input[type="text"] {
     float: left;
     width: 80%;