Rollup merge of rust-lang#60487 - GuillaumeGomez:fix-search-sidebar-width-colors, r=Dylan-DPC

Centril · web-flow · commit bf54251f907c · 2019-05-20T23:02:57.000+02:00
Fix search sidebar width when no crate select is present Fixes rust-lang#60480. I also fixed the box-shadow that seemed to have been kind of removed? r? @QuietMisdreavus
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
@@ -671,18 +671,18 @@ a {
 	transition: border-color 300ms ease;
 	transition: border-radius 300ms ease-in-out;
 	transition: box-shadow 300ms ease-in-out;
-	width: calc(100% - 32px);
+	width: 100%;
 }
 
 #crate-search + .search-input {
 	border-radius: 0 1px 1px 0;
+	width: calc(100% - 32px);
 }
 
 .search-input:focus {
 	border-radius: 2px;
 	border: 0;
 	outline: 0;
-	box-shadow: 0 0 8px #078dd8;
 }
 
 .search-results .desc {
diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css
@@ -164,20 +164,21 @@ a.test-arrow {
 	color: #111;
 	background-color: #f0f0f0;
 	border-color: #000;
+	box-shadow: 0 0 0 1px #000, 0 0 0 2px transparent;
 }
 
 .search-input {
 	color: #111;
-	box-shadow: 0 0 0 1px #000, 0 0 0 2px transparent;
 	background-color: #f0f0f0;
+	box-shadow: 0 0 0 1px #000, 0 0 0 2px transparent;
 }
 
 .search-input:focus {
 	border-color: #008dfd;
 }
 
-#crate-search + .search-input {
-	box-shadow: 1px 0 0 1px #000, 0 0 0 2px transparent;
+#crate-search + .search-input:focus {
+	box-shadow: 0 0 8px 4px #078dd8;
 }
 
 .module-item .stab {
diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css
@@ -164,21 +164,21 @@ a.test-arrow {
 	color: #555;
 	background-color: white;
 	border-color: #e0e0e0;
-	box-shadow: 0px 0 0 1px #e0e0e0, 0 0 0 2px transparent;
+	box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;
 }
 
 .search-input {
 	color: #555;
-	box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;
 	background-color: white;
+	box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;
 }
 
 .search-input:focus {
 	border-color: #66afe9;
 }
 
-#crate-search + .search-input {
-	box-shadow: 1px 0 0 1px #e0e0e0, 0 0 0 2px transparent;
+#crate-search + .search-input:focus {
+	box-shadow: 0 0 8px #078dd8;
 }
 
 .module-item .stab {

Original file line number	Diff line number	Diff line change
`@@ -671,18 +671,18 @@ a {`
`671`	`671`	`transition: border-color 300ms ease;`
`672`	`672`	`transition: border-radius 300ms ease-in-out;`
`673`	`673`	`transition: box-shadow 300ms ease-in-out;`
`674`		`- width: calc(100% - 32px);`
	`674`	`+ width: 100%;`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`#crate-search + .search-input {`
`678`	`678`	`border-radius: 0 1px 1px 0;`
	`679`	`+ width: calc(100% - 32px);`
`679`	`680`	`}`
`680`	`681`
`681`	`682`	`.search-input:focus {`
`682`	`683`	`border-radius: 2px;`
`683`	`684`	`border: 0;`
`684`	`685`	`outline: 0;`
`685`		`- box-shadow: 0 0 8px #078dd8;`
`686`	`686`	`}`
`687`	`687`
`688`	`688`	`.search-results .desc {`
Original file line number	Diff line number	Diff line change
`@@ -164,20 +164,21 @@ a.test-arrow {`
`164`	`164`	`color: #111;`
`165`	`165`	`background-color: #f0f0f0;`
`166`	`166`	`border-color: #000;`
	`167`	`+ box-shadow: 0 0 0 1px #000, 0 0 0 2px transparent;`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`.search-input {`
`170`	`171`	`color: #111;`
`171`		`- box-shadow: 0 0 0 1px #000, 0 0 0 2px transparent;`
`172`	`172`	`background-color: #f0f0f0;`
	`173`	`+ box-shadow: 0 0 0 1px #000, 0 0 0 2px transparent;`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`.search-input:focus {`
`176`	`177`	`border-color: #008dfd;`
`177`	`178`	`}`
`178`	`179`
`179`		`-#crate-search + .search-input {`
`180`		`- box-shadow: 1px 0 0 1px #000, 0 0 0 2px transparent;`
	`180`	`+#crate-search + .search-input:focus {`
	`181`	`+ box-shadow: 0 0 8px 4px #078dd8;`
`181`	`182`	`}`
`182`	`183`
`183`	`184`	`.module-item .stab {`
Original file line number	Diff line number	Diff line change
`@@ -164,21 +164,21 @@ a.test-arrow {`
`164`	`164`	`color: #555;`
`165`	`165`	`background-color: white;`
`166`	`166`	`border-color: #e0e0e0;`
`167`		`- box-shadow: 0px 0 0 1px #e0e0e0, 0 0 0 2px transparent;`
	`167`	`+ box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`.search-input {`
`171`	`171`	`color: #555;`
`172`		`- box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;`
`173`	`172`	`background-color: white;`
	`173`	`+ box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`.search-input:focus {`
`177`	`177`	`border-color: #66afe9;`
`178`	`178`	`}`
`179`	`179`
`180`		`-#crate-search + .search-input {`
`181`		`- box-shadow: 1px 0 0 1px #e0e0e0, 0 0 0 2px transparent;`
	`180`	`+#crate-search + .search-input:focus {`
	`181`	`+ box-shadow: 0 0 8px #078dd8;`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`.module-item .stab {`