From 7ce1b92f9fb34c7ab8e1d6322893864d92298940 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 11 Feb 2025 15:25:08 +0100 Subject: [PATCH 1/2] Improve display of prev/next scraped examples buttons --- src/librustdoc/html/static/css/rustdoc.css | 4 ++++ src/librustdoc/html/static/js/scrape-examples.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index d0612e997fd7b..9cfdda6cbff14 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1697,6 +1697,10 @@ instead, we check that it's not a "finger" cursor. .example-wrap .button-holder > *:not(:first-child) { margin-left: var(--button-left-margin); } +.example-wrap .button-holder .prev, +.example-wrap .button-holder .next { + font-size: 1.3em; +} .example-wrap .button-holder .copy-button { padding: 2px 0 0 4px; } diff --git a/src/librustdoc/html/static/js/scrape-examples.js b/src/librustdoc/html/static/js/scrape-examples.js index d08f15a5bfa86..c0de9b79ecf96 100644 --- a/src/librustdoc/html/static/js/scrape-examples.js +++ b/src/librustdoc/html/static/js/scrape-examples.js @@ -60,8 +60,8 @@ const locs = example.locs; if (locs.length > 1) { - const next = createScrapeButton(buttonHolder, "next", "≻"); - const prev = createScrapeButton(buttonHolder, "prev", "≺"); + const next = createScrapeButton(buttonHolder, "next", ">"); + const prev = createScrapeButton(buttonHolder, "prev", "<"); // Toggle through list of examples in a given file const onChangeLoc = changeIndex => { From 630d46213e8876b92586d9e2952129ef389c3e87 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 11 Feb 2025 15:25:26 +0100 Subject: [PATCH 2/2] Add test to ensure prev/next scraped examples buttons have the right text --- tests/rustdoc-gui/scrape-examples-button-focus.goml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/rustdoc-gui/scrape-examples-button-focus.goml b/tests/rustdoc-gui/scrape-examples-button-focus.goml index 83ed6a219b25a..54b552fc41ee5 100644 --- a/tests/rustdoc-gui/scrape-examples-button-focus.goml +++ b/tests/rustdoc-gui/scrape-examples-button-focus.goml @@ -11,6 +11,8 @@ assert-property: (".scraped-example-list > .scraped-example .rust", { "scrollTop": |initialScrollTop|, }) focus: ".scraped-example-list > .scraped-example .next" +assert-text: (".scraped-example-list > .scraped-example .next", ">") +assert-css: (".scraped-example-list > .scraped-example .next", { "font-size": "20.8px" }) press-key: "Enter" assert-property-false: (".scraped-example-list > .scraped-example .src-line-numbers", { "scrollTop": |initialScrollTop| @@ -19,6 +21,8 @@ assert-property-false: (".scraped-example-list > .scraped-example .rust", { "scrollTop": |initialScrollTop| }, NEAR) focus: ".scraped-example-list > .scraped-example .prev" +assert-css: (".scraped-example-list > .scraped-example .next", { "font-size": "20.8px" }) +assert-text: (".scraped-example-list > .scraped-example .prev", "<") press-key: "Enter" assert-property: (".scraped-example-list > .scraped-example .src-line-numbers", { "scrollTop": |initialScrollTop|