Rollup merge of #64948 - GuillaumeGomez:improve-sidebar-styling, r=Mark-Simulacrum

Centril · web-flow · commit 1c8ef985f2d7 · 2019-10-02T18:24:35.000+02:00
Improve sidebar styling to make its integration easier Part of rust-lang/docs.rs#417 Setting the height was an error: forcing the element bottom to be at the bottom allows to change to top of the sidebar. r? @Mark-Simulacrum
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
@@ -183,7 +183,7 @@ nav.sub {
 	position: fixed;
 	left: 0;
 	top: 0;
-	height: 100vh;
+	bottom: 0;
 	overflow: auto;
 }
 
@@ -573,7 +573,7 @@ h4 > code, h3 > code, .invisible > code {
 	margin-top: 0;
 }
 
-nav {
+nav:not(.sidebar) {
 	border-bottom: 1px solid;
 	padding-bottom: 10px;
 	margin-bottom: 10px;
diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css
@@ -129,7 +129,7 @@ pre {
 pre.rust .comment { color: #8d8d8b; }
 pre.rust .doccomment { color: #8ca375; }
 
-nav {
+nav:not(.sidebar) {
 	border-bottom-color: #4e4e4e;
 }
 nav.main .current {
diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css
@@ -129,7 +129,7 @@ pre {
 pre.rust .comment { color: #8E908C; }
 pre.rust .doccomment { color: #4D4D4C; }
 
-nav {
+nav:not(.sidebar) {
 	border-bottom-color: #e0e0e0;
 }
 nav.main .current {

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ pre {`
`129`	`129`	`pre.rust .comment { color: #8d8d8b; }`
`130`	`130`	`pre.rust .doccomment { color: #8ca375; }`
`131`	`131`
`132`		`-nav {`
	`132`	`+nav:not(.sidebar) {`
`133`	`133`	`border-bottom-color: #4e4e4e;`
`134`	`134`	`}`
`135`	`135`	`nav.main .current {`