bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc: fix font color inheritance from body, and test

Browse source
This commit is contained in:
Michael Howell 2022-11-07 21:18:01 -07:00
parent 303653ef65
commit a45151e2cb
2 changed files with 77 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustdoc/html/static/js/main.js
View file

@ -860,7 +860,8 @@ function loadCss(cssUrl) {
wrapper.style.top = (pos.top + window.scrollY) + "px"; wrapper.style.top = (pos.top + window.scrollY) + "px";
wrapper.style.left = (pos.left + window.scrollX) + "px"; wrapper.style.left = (pos.left + window.scrollX) + "px";
wrapper.style.width = pos.width + "px"; wrapper.style.width = pos.width + "px";
document.documentElement.appendChild(wrapper); const body = document.getElementsByTagName("body")[0];
body.appendChild(wrapper);
window.CURRENT_NOTABLE_ELEMENT = wrapper; window.CURRENT_NOTABLE_ELEMENT = wrapper;
window.CURRENT_NOTABLE_ELEMENT.NOTABLE_BASE = e; window.CURRENT_NOTABLE_ELEMENT.NOTABLE_BASE = e;
wrapper.onpointerleave = function(ev) { wrapper.onpointerleave = function(ev) {
@ -877,7 +878,8 @@ function loadCss(cssUrl) {
function hideNotable() { function hideNotable() {
if (window.CURRENT_NOTABLE_ELEMENT) { if (window.CURRENT_NOTABLE_ELEMENT) {
window.CURRENT_NOTABLE_ELEMENT.NOTABLE_BASE.NOTABLE_FORCE_VISIBLE = false; window.CURRENT_NOTABLE_ELEMENT.NOTABLE_BASE.NOTABLE_FORCE_VISIBLE = false;
document.documentElement.removeChild(window.CURRENT_NOTABLE_ELEMENT); const body = document.getElementsByTagName("body")[0];
body.removeChild(window.CURRENT_NOTABLE_ELEMENT);
window.CURRENT_NOTABLE_ELEMENT = null; window.CURRENT_NOTABLE_ELEMENT = null;
} }
} }

73
src/test/rustdoc-gui/notable-trait.goml
View file

@ -137,3 +137,76 @@ compare-elements-position-false: (
"//*[@id='method.create_an_iterator_from_read']//*[@class='notable-traits']", "//*[@id='method.create_an_iterator_from_read']//*[@class='notable-traits']",
("y", "x"), ("y", "x"),
) )
// Now check the colors.
define-function: (
"check-colors",
(theme, header_color, content_color, type_color, trait_color),
[
("goto", "file://" + |DOC_PATH| + "/test_docs/struct.NotableStructWithLongName.html"),
// This is needed to ensure that the text color is computed.
("show-text", true),
// Setting the theme.
("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
// We reload the page so the local storage settings are being used.
("reload"),
("move-cursor-to", "//*[@id='method.create_an_iterator_from_read']//*[@class='notable-traits']"),
("assert-count", (".notable-traits-tooltiptext", 1)),
("assert-css", (
".notable-traits-tooltiptext h3.notable",
{"color": |header_color|},
ALL,
)),
("assert-css", (
".notable-traits-tooltiptext pre.content",
{"color": |content_color|},
ALL,
)),
("assert-css", (
".notable-traits-tooltiptext pre.content a.struct",
{"color": |type_color|},
ALL,
)),
("assert-css", (
".notable-traits-tooltiptext pre.content a.trait",
{"color": |trait_color|},
ALL,
)),
]
)
call-function: (
"check-colors",
{
"theme": "ayu",
"content_color": "rgb(230, 225, 207)",
"header_color": "rgb(255, 255, 255)",
"type_color": "rgb(255, 160, 165)",
"trait_color": "rgb(57, 175, 215)",
},
)
call-function: (
"check-colors",
{
"theme": "dark",
"content_color": "rgb(221, 221, 221)",
"header_color": "rgb(221, 221, 221)",
"type_color": "rgb(45, 191, 184)",
"trait_color": "rgb(183, 140, 242)",
},
)
call-function: (
"check-colors",
{
"theme": "light",
"content_color": "rgb(0, 0, 0)",
"header_color": "rgb(0, 0, 0)",
"type_color": "rgb(173, 55, 138)",
"trait_color": "rgb(110, 79, 201)",
},
)