Auto merge of rust-lang#106262 - GuillaumeGomez:migrate-more-scraped-…

…examples-css, r=notriddle

Migrate more scraped examples CSS rules to CSS variables

It's based on rust-lang#106218 so it will need to wait for it to be merged first.

r? `@notriddle`

src/librustdoc/html/static/css/rustdoc.css

@@ -1959,6 +1959,14 @@ in storage.js
 .scraped-example .example-wrap .rust span.highlight.focus {
 	background: var(--scrape-example-code-line-highlight-focus);
 }
+.scraped-example-list .scrape-help {
+	border-color: var(--scrape-example-help-border-color);
+	color: var(--scrape-example-help-color);
+}
+.scraped-example-list .scrape-help:hover {
+	border-color: var(--scrape-example-help-hover-border-color);
+	color: var(--scrape-example-help-hover-color);
+}
 
 .more-examples-toggle {
 	max-width: calc(100% + 25px);

src/librustdoc/html/static/css/themes/ayu.css

@@ -93,6 +93,10 @@ Original by Dempfi (https://github.com/dempfi/ayu)
 	--scrape-example-toggle-line-hover-background: #c5c5c5;
 	--scrape-example-code-line-highlight: rgb(91, 59, 1);
 	--scrape-example-code-line-highlight-focus: rgb(124, 75, 15);
+	--scrape-example-help-border-color: #aaa;
+	--scrape-example-help-color: #eee;
+	--scrape-example-help-hover-border-color: #fff;
+	--scrape-example-help-hover-color: #fff;
 }
 
 h1, h2, h3, h4 {
@@ -200,14 +204,6 @@ above the `@media (max-width: 700px)` rules due to a bug in the css checker */
 	color: #ffb44c;
 }
 
-.scraped-example-list .scrape-help {
-	border-color: #aaa;
-	color: #eee;
-}
-.scraped-example-list .scrape-help:hover {
-	border-color: white;
-	color: white;
-}
 .scraped-example:not(.expanded) .code-wrapper::before {
 	background: linear-gradient(to bottom, rgba(15, 20, 25, 1), rgba(15, 20, 25, 0));
 }

src/librustdoc/html/static/css/themes/dark.css

@@ -88,6 +88,10 @@
 	--scrape-example-toggle-line-hover-background: #c5c5c5;
 	--scrape-example-code-line-highlight: rgb(91, 59, 1);
 	--scrape-example-code-line-highlight-focus: rgb(124, 75, 15);
+	--scrape-example-help-border-color: #aaa;
+	--scrape-example-help-color: #eee;
+	--scrape-example-help-hover-border-color: #fff;
+	--scrape-example-help-hover-color: #fff;
 }
 
 #search-tabs > button:not(.selected) {
@@ -100,14 +104,6 @@
 	background-color: #353535;
 }
 
-.scraped-example-list .scrape-help {
-	border-color: #aaa;
-	color: #eee;
-}
-.scraped-example-list .scrape-help:hover {
-	border-color: white;
-	color: white;
-}
 .scraped-example:not(.expanded) .code-wrapper::before {
 	background: linear-gradient(to bottom, rgba(53, 53, 53, 1), rgba(53, 53, 53, 0));
 }

src/librustdoc/html/static/css/themes/light.css

@@ -85,6 +85,10 @@
 	--scrape-example-toggle-line-hover-background: #999;
 	--scrape-example-code-line-highlight: #fcffd6;
 	--scrape-example-code-line-highlight-focus: #f6fdb0;
+	--scrape-example-help-border-color: #555;
+	--scrape-example-help-color: #333;
+	--scrape-example-help-hover-border-color: #000;
+	--scrape-example-help-hover-color: #000;
 }
 
 #search-tabs > button:not(.selected) {
@@ -97,14 +101,6 @@
 	border-top-color: #0089ff;
 }
 
-.scraped-example-list .scrape-help {
-	border-color: #555;
-	color: #333;
-}
-.scraped-example-list .scrape-help:hover {
-	border-color: black;
-	color: black;
-}
 .scraped-example:not(.expanded) .code-wrapper::before {
 	background: linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0));
 }

src/test/rustdoc-gui/scrape-examples-color.goml

@@ -1,9 +1,11 @@
 // Check that scrape example code blocks have the expected colors.
 goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test_many.html"
+show-text: true
 
 define-function: (
     "check-colors",
-    (theme, highlight, highlight_focus),
+    (theme, highlight, highlight_focus, help_border, help_color, help_hover_border,
+     help_hover_color),
     [
         ("local-storage", { "rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false", }),
         ("reload"),
@@ -14,21 +16,45 @@ define-function: (
         ("assert-css", (".scraped-example .example-wrap .rust span.highlight.focus", {
             "background-color": |highlight_focus|,
         }, ALL)),
+
+        ("assert-css", (".scraped-example-list .scrape-help", {
+            "border-color": |help_border|,
+            "color": |help_color|,
+        })),
+        ("move-cursor-to", ".scraped-example-list .scrape-help"),
+        ("assert-css", (".scraped-example-list .scrape-help:hover", {
+            "border-color": |help_hover_border|,
+            "color": |help_hover_color|,
+        })),
+        // Moving the cursor to another item to not break next runs.
+        ("move-cursor-to", ".search-input"),
     ]
 )
 
 call-function: ("check-colors", {
     "theme": "ayu",
     "highlight": "rgb(91, 59, 1)",
     "highlight_focus": "rgb(124, 75, 15)",
+    "help_border": "rgb(170, 170, 170)",
+    "help_color": "rgb(238, 238, 238)",
+    "help_hover_border": "rgb(255, 255, 255)",
+    "help_hover_color": "rgb(255, 255, 255)",
 })
 call-function: ("check-colors", {
     "theme": "dark",
     "highlight": "rgb(91, 59, 1)",
     "highlight_focus": "rgb(124, 75, 15)",
+    "help_border": "rgb(170, 170, 170)",
+    "help_color": "rgb(238, 238, 238)",
+    "help_hover_border": "rgb(255, 255, 255)",
+    "help_hover_color": "rgb(255, 255, 255)",
 })
 call-function: ("check-colors", {
     "theme": "light",
     "highlight": "rgb(252, 255, 214)",
     "highlight_focus": "rgb(246, 253, 176)",
+    "help_border": "rgb(85, 85, 85)",
+    "help_color": "rgb(51, 51, 51)",
+    "help_hover_border": "rgb(0, 0, 0)",
+    "help_hover_color": "rgb(0, 0, 0)",
 })