From b04151bca8d43aceb8a0bf018fb736cb215d0729 Mon Sep 17 00:00:00 2001
From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>
Date: Fri, 5 Jan 2018 01:41:01 +0100
Subject: [PATCH] improved sidebar search field style

---
 sphinx/themes/basic/searchbox.html         |  6 ++++--
 sphinx/themes/basic/static/basic.css_t     | 14 +++++++++++++-
 sphinx/themes/nature/static/nature.css_t   |  7 ++-----
 sphinx/themes/pyramid/static/pyramid.css_t |  7 ++-----
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/sphinx/themes/basic/searchbox.html b/sphinx/themes/basic/searchbox.html
index a8ea03cc8..506877410 100644
--- a/sphinx/themes/basic/searchbox.html
+++ b/sphinx/themes/basic/searchbox.html
@@ -10,12 +10,14 @@
 {%- if pagename != "search" and builder != "singlehtml" %}
 <div id="searchbox" style="display: none" role="search">
   <h3>{{ _('Quick search') }}</h3>
+    <div class="searchformwrapper">
     <form class="search" action="{{ pathto('search') }}" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="{{ _('Go') }}" /></div>
+      <input type="text" name="q" />
+      <input type="submit" value="{{ _('Go') }}" />
       <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>
 {%- endif %}
diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
index 745864e28..efb997d8f 100644
--- a/sphinx/themes/basic/static/basic.css_t
+++ b/sphinx/themes/basic/static/basic.css_t
@@ -82,9 +82,21 @@ div.sphinxsidebar input {
 }
 
 div.sphinxsidebar #searchbox input[type="text"] {
-    width: 170px;
+    float: left;
+    width: 80%;
+    padding: 0.25em;
+    box-sizing: border-box;
 }
 
+div.sphinxsidebar #searchbox input[type="submit"] {
+    float: left;
+    width: 20%;
+    border-left: none;
+    padding: 0.25em;
+    box-sizing: border-box;
+}
+
+
 img {
     border: 0;
     max-width: 100%;
diff --git a/sphinx/themes/nature/static/nature.css_t b/sphinx/themes/nature/static/nature.css_t
index 5751bf940..ff2b1d5ff 100644
--- a/sphinx/themes/nature/static/nature.css_t
+++ b/sphinx/themes/nature/static/nature.css_t
@@ -125,14 +125,11 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
-div.sphinxsidebar input[type=text]{
+div.sphinxsidebar .searchformwrapper {
     margin-left: 20px;
+    margin-right: 20px;
 }
 
-div.sphinxsidebar input[type=submit]{
-    margin-left: 20px;
-}
- 
 /* -- body styles ----------------------------------------------------------- */
  
 a {
diff --git a/sphinx/themes/pyramid/static/pyramid.css_t b/sphinx/themes/pyramid/static/pyramid.css_t
index 93799111e..792f45452 100644
--- a/sphinx/themes/pyramid/static/pyramid.css_t
+++ b/sphinx/themes/pyramid/static/pyramid.css_t
@@ -148,12 +148,9 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
-div.sphinxsidebar input[type=text]{
-    margin-left: 20px;
-}
-
-div.sphinxsidebar input[type=submit]{
+div.sphinxsidebar .searchformwrapper {
     margin-left: 20px;
+    margin-right: 20px;
 }
 
 /* -- sidebars -------------------------------------------------------------- */