From 7a90abf9a1168bdb894ea0825a7d1c799f927f08 Mon Sep 17 00:00:00 2001
From: Zexbe <zexbe@users.noreply.github.com>
Date: Mon, 3 Feb 2020 10:52:38 -0800
Subject: [PATCH 1/6] Make search tab style match navigation

---
 templates/navigation.hbs         | 2 +-
 templates/navigation_rustdoc.hbs | 2 +-
 templates/style.scss             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/navigation.hbs b/templates/navigation.hbs
index 62951763b..81227d118 100644
--- a/templates/navigation.hbs
+++ b/templates/navigation.hbs
@@ -3,7 +3,7 @@
         <div class="pure-menu pure-menu-horizontal" role="navigation" aria-label="Main navigation">
           <form action="/releases/search" method="GET" class="landing-search-form-nav">
             {{#unless varsb.show_search_form}}
-            <input class="search-input-nav" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate &#x1F50D;"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
+            <input class="search-input-nav" name="query" type="text" aria-label="Find crate by search query" placeholder="&#xf002; Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
             {{/unless}}
           <a href="/" class="pure-menu-heading pure-menu-link" aria-label="Docs.rs"><i class="fa fa-cubes fa-fw"></i> Docs.rs</a>
           <ul class="pure-menu-list">
diff --git a/templates/navigation_rustdoc.hbs b/templates/navigation_rustdoc.hbs
index 379f82df7..5a98f6c82 100644
--- a/templates/navigation_rustdoc.hbs
+++ b/templates/navigation_rustdoc.hbs
@@ -3,7 +3,7 @@
         <div class="pure-menu pure-menu-horizontal">
           <form action="/releases/search" method="GET" class="landing-search-form-nav">
             {{#unless varsb.show_search_form}}
-            <input class="search-input-nav" name="query" aria-label="Find crate by search query" tabindex="-1" type="text" placeholder="Find crate &#x1F50D;"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
+            <input class="search-input-nav" name="query" aria-label="Find crate by search query" tabindex="-1" type="text" placeholder="&#xf002; Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
             {{/unless}}
             <a href="/" class="pure-menu-heading pure-menu-link"><i class="fa fa-cubes fa-fw"></i><span class="title"> Docs.rs</span></a>
           {{#with content.crate_details}}
diff --git a/templates/style.scss b/templates/style.scss
index d4022106e..b7c4a0cef 100644
--- a/templates/style.scss
+++ b/templates/style.scss
@@ -177,6 +177,7 @@ div.nav-container {
             float: right;
             max-width: 200px;
             border: none;
+            border-left: 1px solid $color-border;
             margin: 0 1em 0 0;
             font-size: 0.8em;
             text-align: right;
@@ -184,7 +185,6 @@ div.nav-container {
             background-color: #fff;
             height: 31px;
             display: none;
-            box-shadow: 0px 0px 2px #000;
 
             @media #{$media-sm} {
                 display: block;

From 53c3ae43fe388de9164228598193da4d24b7d647 Mon Sep 17 00:00:00 2001
From: Zexbe <zexbe@users.noreply.github.com>
Date: Mon, 3 Feb 2020 10:59:51 -0800
Subject: [PATCH 2/6] Add FontAwesome to the input

---
 templates/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/style.scss b/templates/style.scss
index b7c4a0cef..a4d719f5a 100644
--- a/templates/style.scss
+++ b/templates/style.scss
@@ -185,6 +185,7 @@ div.nav-container {
             background-color: #fff;
             height: 31px;
             display: none;
+            font-family: append(FontAwesome, $font-family-sans, "comma");
 
             @media #{$media-sm} {
                 display: block;

From 9ea1e07547cf0802eeaac173723ab025152ab3b4 Mon Sep 17 00:00:00 2001
From: Zexbe <zexbe@users.noreply.github.com>
Date: Mon, 3 Feb 2020 11:13:30 -0800
Subject: [PATCH 3/6] Only show search seperator on medium+

---
 templates/style.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/style.scss b/templates/style.scss
index a4d719f5a..8143d786c 100644
--- a/templates/style.scss
+++ b/templates/style.scss
@@ -177,7 +177,6 @@ div.nav-container {
             float: right;
             max-width: 200px;
             border: none;
-            border-left: 1px solid $color-border;
             margin: 0 1em 0 0;
             font-size: 0.8em;
             text-align: right;
@@ -190,6 +189,10 @@ div.nav-container {
             @media #{$media-sm} {
                 display: block;
             }
+            
+            @media #{$media-md} {
+                border-left: 1px solid $color-border;
+            }
         }
 
         input.search-input-nav:focus {

From 1a528e71a53e4c9ab39402a9738985fe6bd75d00 Mon Sep 17 00:00:00 2001
From: Zexbe <zexbe@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:12:25 -0800
Subject: [PATCH 4/6] Move icon out of placeholder

---
 templates/navigation.hbs         |  5 ++++-
 templates/navigation_rustdoc.hbs |  5 ++++-
 templates/style.scss             | 28 ++++++++++++++++------------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/templates/navigation.hbs b/templates/navigation.hbs
index 81227d118..bf68eb15d 100644
--- a/templates/navigation.hbs
+++ b/templates/navigation.hbs
@@ -3,7 +3,10 @@
         <div class="pure-menu pure-menu-horizontal" role="navigation" aria-label="Main navigation">
           <form action="/releases/search" method="GET" class="landing-search-form-nav">
             {{#unless varsb.show_search_form}}
-            <input class="search-input-nav" name="query" type="text" aria-label="Find crate by search query" placeholder="&#xf002; Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
+            <div class="search-input-nav">
+              <label for="nav-search"><i class="fa fa-fw fa-search"></i></label>
+              <input id="nav-search" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
+            </div>
             {{/unless}}
           <a href="/" class="pure-menu-heading pure-menu-link" aria-label="Docs.rs"><i class="fa fa-cubes fa-fw"></i> Docs.rs</a>
           <ul class="pure-menu-list">
diff --git a/templates/navigation_rustdoc.hbs b/templates/navigation_rustdoc.hbs
index 5a98f6c82..262f041c2 100644
--- a/templates/navigation_rustdoc.hbs
+++ b/templates/navigation_rustdoc.hbs
@@ -3,7 +3,10 @@
         <div class="pure-menu pure-menu-horizontal">
           <form action="/releases/search" method="GET" class="landing-search-form-nav">
             {{#unless varsb.show_search_form}}
-            <input class="search-input-nav" name="query" aria-label="Find crate by search query" tabindex="-1" type="text" placeholder="&#xf002; Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
+            <div class="search-input-nav">
+              <label for="nav-search"><i class="fa fa-fw fa-search"></i></label>
+              <input id="nav-search" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
+            </div>
             {{/unless}}
             <a href="/" class="pure-menu-heading pure-menu-link"><i class="fa fa-cubes fa-fw"></i><span class="title"> Docs.rs</span></a>
           {{#with content.crate_details}}
diff --git a/templates/style.scss b/templates/style.scss
index 8143d786c..9a68cd91d 100644
--- a/templates/style.scss
+++ b/templates/style.scss
@@ -173,27 +173,31 @@ div.nav-container {
     form.landing-search-form-nav {
         max-width: 1200px;
 
-        input.search-input-nav {
+        div.search-input-nav {
             float: right;
             max-width: 200px;
-            border: none;
-            margin: 0 1em 0 0;
-            font-size: 0.8em;
-            text-align: right;
-            box-shadow: none;
-            background-color: #fff;
-            height: 31px;
+            border-left: 1px solid $color-border;
             display: none;
-            font-family: append(FontAwesome, $font-family-sans, "comma");
 
             @media #{$media-sm} {
                 display: block;
             }
-            
-            @media #{$media-md} {
-                border-left: 1px solid $color-border;
+
+            label {
+                color: #777;
+                padding-left: 1em;
+            }
+
+            input {
+                border: none;
+                margin: 0 1em 0 0;
+                font-size: 0.8em;
+                box-shadow: none;
+                background-color: #fff;
+                height: 31px;
             }
         }
+        
 
         input.search-input-nav:focus {
             outline: unset;

From 40780493605fd96c517fd05259da92342f22405d Mon Sep 17 00:00:00 2001
From: Zexbe <zexbe@users.noreply.github.com>
Date: Mon, 3 Feb 2020 13:29:26 -0800
Subject: [PATCH 5/6] Improve header search bar resizing

---
 templates/style.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/style.scss b/templates/style.scss
index 9a68cd91d..75e78918b 100644
--- a/templates/style.scss
+++ b/templates/style.scss
@@ -175,14 +175,18 @@ div.nav-container {
 
         div.search-input-nav {
             float: right;
-            max-width: 200px;
-            border-left: 1px solid $color-border;
+            max-width: 150px;
             display: none;
+            border-left: 1px solid $color-border;
 
             @media #{$media-sm} {
                 display: block;
             }
 
+            @media #{$media-md} {
+                max-width: 200px;
+            }
+
             label {
                 color: #777;
                 padding-left: 1em;

From 11b595cdf1ca7474ec2085fa325d625c46add27e Mon Sep 17 00:00:00 2001
From: Zexbe <zexbe@users.noreply.github.com>
Date: Thu, 6 Feb 2020 07:35:03 -0800
Subject: [PATCH 6/6] Update search label

---
 templates/style.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/style.scss b/templates/style.scss
index 75e78918b..96a84e5d2 100644
--- a/templates/style.scss
+++ b/templates/style.scss
@@ -189,7 +189,9 @@ div.nav-container {
 
             label {
                 color: #777;
-                padding-left: 1em;
+                cursor: pointer;
+                padding-left: 0.5rem;
+                font-size: 0.8em;
             }
 
             input {