rustdoc: fix the search-bar layout

Now with broader compatibility.

2 files changed, 11 insertions, 5 deletions

diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index bfa6651fe0a..36d98755e02 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -58,11 +58,13 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
 
     <nav class=\"sub\">
         <form class=\"search-form js-only\">
-            <input class=\"search-input\" name=\"search\"
-                   autocomplete=\"off\"
-                   placeholder=\"Search documentation...\"
-                   type=\"search\" />
             <button class=\"do-search\">Search</button>
+            <div class=\"search-container\">
+                <input class=\"search-input\" name=\"search\"
+                       autocomplete=\"off\"
+                       placeholder=\"Search documentation...\"
+                       type=\"search\" />
+            </div>
         </form>
     </nav>
 
diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 80bdb0a9e4f..e0f4a9c167d 100644
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -233,10 +233,14 @@ a {
 .content a.fn, .block a.current.fn { color: #8c6067; }
 .content .fnname { color: #8c6067; }
 
+.search-container {
+    padding-right: 10px;
+    overflow: hidden;
+}
 .search-input {
     border: 2px solid #e9e9e9;
     border-radius: 2px;
-    width: calc(100% - 66px);
+    width: 100%;
 }
 .do-search {
     float: right;