Auto merge of #47686 - GuillaumeGomez:theme-fixes, r=QuietMisdreavus

bors · bors · commit 4cf26f8a1330 · 2018-01-25T06:12:06.000Z
Few fixes for multiple themes support feature r? @QuietMisdreavus Fixes #47695.
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
@@ -74,10 +74,12 @@ r##"<!DOCTYPE html>
         {sidebar}
     </nav>
 
-    <button id="theme-picker">
-        <img src="{root_path}brush.svg" width="18" alt="Pick another theme!">
+    <div class="theme-picker">
+        <button id="theme-picker" aria-label="Pick another theme!">
+            <img src="{root_path}brush.svg" width="18" alt="Pick another theme!">
+        </button>
         <div id="theme-choices"></div>
-    </button>
+    </div>
     <script src="{root_path}theme.js"></script>
     <nav class="sub">
         <form class="search-form js-only">
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
@@ -918,12 +918,12 @@ themePicker.onclick = function() {{
     }}
 }};
 [{}].forEach(function(item) {{
-    var div = document.createElement('div');
-    div.innerHTML = item;
-    div.onclick = function(el) {{
+    var but = document.createElement('button');
+    but.innerHTML = item;
+    but.onclick = function(el) {{
         switchTheme(currentTheme, mainTheme, item);
     }};
-    themes.appendChild(div);
+    themes.appendChild(but);
 }});
 "#, themes.iter()
           .map(|s| format!("\"{}\"", s))
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
@@ -1141,13 +1141,19 @@ kbd {
 	border: solid 1px;
 	border-radius: 3px;
 	box-shadow: inset 0 -1px 0;
+	cursor: default;
 }
 
-#theme-picker {
+.theme-picker {
 	position: absolute;
 	left: 211px;
-	top: 17px;
+	top: 19px;
+}
+
+#theme-picker {
 	padding: 4px;
+	width: 27px;
+	height: 29px;
 	border: 1px solid;
 	border-radius: 3px;
 	cursor: pointer;
@@ -1156,21 +1162,28 @@ kbd {
 #theme-choices {
 	display: none;
 	position: absolute;
-	left: -1px;
-	top: 30px;
+	left: 0;
+	top: 28px;
 	border: 1px solid;
 	border-radius: 3px;
 	z-index: 1;
+	cursor: pointer;
 }
 
-#theme-choices > div {
-	border-top: 1px solid;
+#theme-choices > button {
+	border: none;
+	width: 100%;
 	padding: 4px;
 	text-align: center;
+	background: rgba(0,0,0,0);
+}
+
+#theme-choices > button:not(:first-child) {
+	border-top: 1px solid;
 }
 
 @media (max-width: 700px) {
-	#theme-picker {
+	.theme-picker {
 		left: 109px;
 		top: 7px;
 		z-index: 1;
diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css
@@ -197,7 +197,7 @@ a.test-arrow {
 
 #help dt {
 	border-color: #bfbfbf;
-	background: #fff;
+	background: rgba(0,0,0,0);
 	color: black;
 }
 
@@ -352,7 +352,7 @@ pre.ignore:hover, .information:hover + pre.ignore {
 }
 
 kbd {
-	color: #444d56;
+	color: #000;
 	background-color: #fafbfc;
 	border-color: #d1d5da;
 	border-bottom-color: #c6cbd1;
@@ -364,16 +364,20 @@ kbd {
 	background: #f0f0f0;
 }
 
+#theme-picker:hover, #theme-picker:focus {
+	border-color: #ffb900;
+}
+
 #theme-choices {
 	border-color: #e0e0e0;
 	background-color: #353535;
 }
 
-#theme-choices > div {
-	border-top: #e0e0e0;
+#theme-choices > button:not(:first-child) {
+	border-top-color: #e0e0e0;
 }
 
-#theme-choices > div:hover {
+#theme-choices > button:hover, #theme-choices > button:focus {
 	background-color: #444;
 }
 
diff --git a/src/librustdoc/html/static/themes/main.css b/src/librustdoc/html/static/themes/main.css
@@ -345,7 +345,7 @@ pre.ignore:hover, .information:hover + pre.ignore {
 }
 
 kbd {
-	color: #444d56;
+	color: #000;
 	background-color: #fafbfc;
 	border-color: #d1d5da;
 	border-bottom-color: #c6cbd1;
@@ -354,18 +354,23 @@ kbd {
 
 #theme-picker {
 	border-color: #e0e0e0;
+	background-color: #fff;
+}
+
+#theme-picker:hover, #theme-picker:focus {
+	border-color: #717171;
 }
 
 #theme-choices {
 	border-color: #ccc;
 	background-color: #fff;
 }
 
-#theme-choices > div {
-	border-top: #e0e0e0;
+#theme-choices > button:not(:first-child) {
+	border-top-color: #e0e0e0;
 }
 
-#theme-choices > div:hover {
+#theme-choices > button:hover, #theme-choices > button:focus {
 	background-color: #eee;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ a.test-arrow {`
`197`	`197`
`198`	`198`	`#help dt {`
`199`	`199`	`border-color: #bfbfbf;`
`200`		`- background: #fff;`
	`200`	`+ background: rgba(0,0,0,0);`
`201`	`201`	`color: black;`
`202`	`202`	`}`
`203`	`203`
`@@ -352,7 +352,7 @@ pre.ignore:hover, .information:hover + pre.ignore {`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`kbd {`
`355`		`- color: #444d56;`
	`355`	`+ color: #000;`
`356`	`356`	`background-color: #fafbfc;`
`357`	`357`	`border-color: #d1d5da;`
`358`	`358`	`border-bottom-color: #c6cbd1;`
`@@ -364,16 +364,20 @@ kbd {`
`364`	`364`	`background: #f0f0f0;`
`365`	`365`	`}`
`366`	`366`
	`367`	`+#theme-picker:hover, #theme-picker:focus {`
	`368`	`+ border-color: #ffb900;`
	`369`	`+}`
	`370`	`+`
`367`	`371`	`#theme-choices {`
`368`	`372`	`border-color: #e0e0e0;`
`369`	`373`	`background-color: #353535;`
`370`	`374`	`}`
`371`	`375`
`372`		`-#theme-choices > div {`
`373`		`- border-top: #e0e0e0;`
	`376`	`+#theme-choices > button:not(:first-child) {`
	`377`	`+ border-top-color: #e0e0e0;`
`374`	`378`	`}`
`375`	`379`
`376`		`-#theme-choices > div:hover {`
	`380`	`+#theme-choices > button:hover, #theme-choices > button:focus {`
`377`	`381`	`background-color: #444;`
`378`	`382`	`}`
`379`	`383`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ pre.ignore:hover, .information:hover + pre.ignore {`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`kbd {`
`348`		`- color: #444d56;`
	`348`	`+ color: #000;`
`349`	`349`	`background-color: #fafbfc;`
`350`	`350`	`border-color: #d1d5da;`
`351`	`351`	`border-bottom-color: #c6cbd1;`
`@@ -354,18 +354,23 @@ kbd {`
`354`	`354`
`355`	`355`	`#theme-picker {`
`356`	`356`	`border-color: #e0e0e0;`
	`357`	`+ background-color: #fff;`
	`358`	`+}`
	`359`	`+`
	`360`	`+#theme-picker:hover, #theme-picker:focus {`
	`361`	`+ border-color: #717171;`
`357`	`362`	`}`
`358`	`363`
`359`	`364`	`#theme-choices {`
`360`	`365`	`border-color: #ccc;`
`361`	`366`	`background-color: #fff;`
`362`	`367`	`}`
`363`	`368`
`364`		`-#theme-choices > div {`
`365`		`- border-top: #e0e0e0;`
	`369`	`+#theme-choices > button:not(:first-child) {`
	`370`	`+ border-top-color: #e0e0e0;`
`366`	`371`	`}`
`367`	`372`
`368`		`-#theme-choices > div:hover {`
	`373`	`+#theme-choices > button:hover, #theme-choices > button:focus {`
`369`	`374`	`background-color: #eee;`
`370`	`375`	`}`
`371`	`376`