merged all the latest changes from 2.4 to trunk

doc/_themes/blue/searchbox.html

@@ -0,0 +1,21 @@
+{#
+    basic/searchbox.html
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: quick search box.
+
+    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- if pagename != "search" %}
+<div id="searchbox" style="display: none">
+      <form class="search" action="{{ pathto('search') }}" method="get">
+      <input type="text" name="q" size="18" />
+      <input type="submit" value="{{ _('Search') }}" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+      </p>
+    </form>
+</div>
+<script type="text/javascript">$('#searchbox').show(0);</script>
+{%- endif %}

doc/_themes/blue/static/default.css_t

@@ -85,6 +85,7 @@ div.related a {
 
 div.sphinxsidebar {
     word-wrap: break-word;
+    width: 240px;
     {%- if theme_stickysidebar|tobool %}
     top: 30px;
     margin: 0;