From 64890f4e2b733655fee5077a5435a8812404c3a3 Mon Sep 17 00:00:00 2001
From: Andrew Bonventre <andybons@golang.org>
Date: Mon, 11 Dec 2017 13:51:56 -0500
Subject: [PATCH] godoc: fix missing search icon on /dl and correct borders

Some default browser stylesheets set a border radius on <button>
elements that was not being overridden in style.css. The button
should not have any border radii on the left as it should look
like an extension of the search field.

Change-Id: I458bd2e3a903a4c1dd246ff0304e7d3cf29c0988
Reviewed-on: https://go-review.googlesource.com/83296
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 godoc/dl/tmpl.go        | 2 +-
 godoc/static/godoc.html | 2 +-
 godoc/static/static.go  | 4 +++-
 godoc/static/style.css  | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/godoc/dl/tmpl.go b/godoc/dl/tmpl.go
index 440917abfc..c5df742a19 100644
--- a/godoc/dl/tmpl.go
+++ b/godoc/dl/tmpl.go
@@ -89,7 +89,7 @@ const templateHTML = `
 <a href="/project/">The Project</a>
 <a href="/help/">Help</a>
 <a href="/blog/">Blog</a>
-<input type="text" id="search" name="q" class="inactive" value="Search" placeholder="Search">
+<span class="search-box"><input type="search" id="search" name="q" placeholder="Search" aria-label="Search" required><button type="submit"><span><!-- magnifying glass: --><svg width="24" height="24" viewBox="0 0 24 24"><title>submit search</title><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></span></button></span>
 </div>
 </form>
 
diff --git a/godoc/static/godoc.html b/godoc/static/godoc.html
index e0caaa8957..fb26901c83 100644
--- a/godoc/static/godoc.html
+++ b/godoc/static/godoc.html
@@ -38,7 +38,7 @@
 {{if .Playground}}
 <a id="playgroundButton" href="http://play.golang.org/" title="Show Go Playground">Play</a>
 {{end}}
-<span class="search-box"><input type="search" id="search" name="q" placeholder="Search" aria-label="Search" required><button type="submit"><span><svg width="24" height="24" viewBox="0 0 24 24"><title>submit search</title><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></span></button></span>
+<span class="search-box"><input type="search" id="search" name="q" placeholder="Search" aria-label="Search" required><button type="submit"><span><!-- magnifying glass: --><svg width="24" height="24" viewBox="0 0 24 24"><title>submit search</title><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></span></button></span>
 </div>
 </form>
 
diff --git a/godoc/static/static.go b/godoc/static/static.go
index b41e911031..8197d89460 100644
--- a/godoc/static/static.go
+++ b/godoc/static/static.go
@@ -502,7 +502,7 @@ var Files = map[string]string{
 {{if .Playground}}
 <a id="playgroundButton" href="http://play.golang.org/" title="Show Go Playground">Play</a>
 {{end}}
-<span class="search-box"><input type="search" id="search" name="q" placeholder="Search" aria-label="Search" required><button type="submit"><span><svg width="24" height="24" viewBox="0 0 24 24"><title>submit search</title><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></span></button></span>
+<span class="search-box"><input type="search" id="search" name="q" placeholder="Search" aria-label="Search" required><button type="submit"><span><!-- magnifying glass: --><svg width="24" height="24" viewBox="0 0 24 24"><title>submit search</title><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></span></button></span>
 </div>
 </form>
 
@@ -3183,7 +3183,9 @@ input#search + button {
 	background-color: #375EAB;
 	color: white;
 	border: 1px solid #375EAB;
+	border-top-left-radius: 0;
 	border-top-right-radius: 5px;
+	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 5px;
 	margin-left: 0;
 	cursor: pointer;
diff --git a/godoc/static/style.css b/godoc/static/style.css
index 036e4177a4..e4d1e4c387 100644
--- a/godoc/static/style.css
+++ b/godoc/static/style.css
@@ -306,7 +306,9 @@ input#search + button {
 	background-color: #375EAB;
 	color: white;
 	border: 1px solid #375EAB;
+	border-top-left-radius: 0;
 	border-top-right-radius: 5px;
+	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 5px;
 	margin-left: 0;
 	cursor: pointer;