From f76c4b84c9d3def13d4514db0d13201693552274 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 1 Dec 2022 15:55:09 +0100 Subject: Migrate summary toggle filter to CSS variable --- src/librustdoc/html/static/css/rustdoc.css | 1 + 1 file changed, 1 insertion(+) (limited to 'src/librustdoc/html/static/css/rustdoc.css') diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 98a5b761ded..fc688e28571 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1521,6 +1521,7 @@ details.rustdoc-toggle > summary::before { display: inline-block; vertical-align: middle; opacity: .5; + filter: var(--toggle-filter); } details.rustdoc-toggle > summary.hideme > span, -- cgit 1.4.1-3-g733a5 From 935def4df19d72bb9e7766a47de1621b4046d264 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 1 Dec 2022 11:31:44 -0700 Subject: rustdoc: use simpler CSS for setting the font on scraped examples --- src/librustdoc/html/static/css/rustdoc.css | 4 +--- src/test/rustdoc-gui/scrape-examples-fonts.goml | 8 ++++++++ src/test/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs | 3 +++ src/test/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs | 3 +++ src/test/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs | 3 +++ src/test/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs | 3 +++ src/test/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs | 3 +++ src/test/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs | 3 +++ src/test/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs | 3 +++ src/test/rustdoc-gui/src/scrape_examples/src/lib.rs | 2 ++ 10 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 src/test/rustdoc-gui/scrape-examples-fonts.goml create mode 100644 src/test/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs create mode 100644 src/test/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs create mode 100644 src/test/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs create mode 100644 src/test/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs create mode 100644 src/test/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs create mode 100644 src/test/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs create mode 100644 src/test/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs (limited to 'src/librustdoc/html/static/css/rustdoc.css') diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 02a51312e8f..055ac9fa505 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -197,9 +197,7 @@ a.srclink, #help-button > a, details.rustdoc-toggle.top-doc > summary, details.rustdoc-toggle.non-exhaustive > summary, -.scraped-example-title, -.more-examples-toggle summary, .more-examples-toggle .hide-more, -.example-links a, +.scraped-example-list, /* This selector is for the items listed in the "all items" page. */ ul.all-items { font-family: "Fira Sans", Arial, NanumBarunGothic, sans-serif; diff --git a/src/test/rustdoc-gui/scrape-examples-fonts.goml b/src/test/rustdoc-gui/scrape-examples-fonts.goml new file mode 100644 index 00000000000..b7d7f4ccb4a --- /dev/null +++ b/src/test/rustdoc-gui/scrape-examples-fonts.goml @@ -0,0 +1,8 @@ +goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test_many.html" + +store-value: (font, '"Fira Sans", Arial, NanumBarunGothic, sans-serif') + +wait-for-css: (".scraped-example-title", {"font-family": |font|}) +wait-for-css: (".more-examples-toggle summary", {"font-family": |font|}) +wait-for-css: (".more-examples-toggle .hide-more", {"font-family": |font|}) +wait-for-css: (".example-links a", {"font-family": |font|}) diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs new file mode 100644 index 00000000000..1d1bc5002aa --- /dev/null +++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-1.rs @@ -0,0 +1,3 @@ +fn main() { + scrape_examples::test_many(); +} diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs new file mode 100644 index 00000000000..1d1bc5002aa --- /dev/null +++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-2.rs @@ -0,0 +1,3 @@ +fn main() { + scrape_examples::test_many(); +} diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs new file mode 100644 index 00000000000..1d1bc5002aa --- /dev/null +++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-3.rs @@ -0,0 +1,3 @@ +fn main() { + scrape_examples::test_many(); +} diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs new file mode 100644 index 00000000000..1d1bc5002aa --- /dev/null +++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-4.rs @@ -0,0 +1,3 @@ +fn main() { + scrape_examples::test_many(); +} diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs new file mode 100644 index 00000000000..1d1bc5002aa --- /dev/null +++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-5.rs @@ -0,0 +1,3 @@ +fn main() { + scrape_examples::test_many(); +} diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs new file mode 100644 index 00000000000..1d1bc5002aa --- /dev/null +++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-6.rs @@ -0,0 +1,3 @@ +fn main() { + scrape_examples::test_many(); +} diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs new file mode 100644 index 00000000000..1d1bc5002aa --- /dev/null +++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check-many-7.rs @@ -0,0 +1,3 @@ +fn main() { + scrape_examples::test_many(); +} diff --git a/src/test/rustdoc-gui/src/scrape_examples/src/lib.rs b/src/test/rustdoc-gui/src/scrape_examples/src/lib.rs index 6412de2c03a..88b03cf2603 100644 --- a/src/test/rustdoc-gui/src/scrape_examples/src/lib.rs +++ b/src/test/rustdoc-gui/src/scrape_examples/src/lib.rs @@ -5,3 +5,5 @@ /// test(); /// ``` pub fn test() {} + +pub fn test_many() {} -- cgit 1.4.1-3-g733a5