From c58246efe47bea09d4f3e70f536e4c9bb7770749 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Fri, 16 Jul 2021 17:24:35 -0700
Subject: [PATCH 1/4] Rustdoc accessibility: use an icon for the [-]/[+]
 controls

This way, we can show the plus and minus buttons on screens, while voice
control will read off actual words "Collapse" and "Expand" instead of reading
"open brace minus close brace" and "open brace plus close brace".

Part of #87059
---
 src/librustdoc/html/render/write_shared.rs    |   7 ++-
 src/librustdoc/html/static/css/rustdoc.css    |  54 ++++++++++++++++--
 src/librustdoc/html/static/css/themes/ayu.css |   5 ++
 .../html/static/css/themes/dark.css           |   5 ++
 .../html/static/images/minus-17x17.png        | Bin 0 -> 3183 bytes
 .../html/static/images/minus-17x17.png.url    |   1 +
 .../html/static/images/plus-17x17.png         | Bin 0 -> 3337 bytes
 .../html/static/images/plus-17x17.png.url     |   1 +
 src/librustdoc/html/static_files.rs           |   4 ++
 9 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 src/librustdoc/html/static/images/minus-17x17.png
 create mode 100644 src/librustdoc/html/static/images/minus-17x17.png.url
 create mode 100644 src/librustdoc/html/static/images/plus-17x17.png
 create mode 100644 src/librustdoc/html/static/images/plus-17x17.png.url

diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs
index 94a902a2d0522..f529b2f2bfcdc 100644
--- a/src/librustdoc/html/render/write_shared.rs
+++ b/src/librustdoc/html/render/write_shared.rs
@@ -126,13 +126,16 @@ impl Context<'_> {
         emit: &[EmitType],
     ) -> Result<(), Error> {
         let tmp;
+        let contents =
+            contents.replace("data-url(minus-17x17.png)", static_files::MINUS_PNG_DATAURL);
+        let contents = contents.replace("data-url(plus-17x17.png)", static_files::PLUS_PNG_DATAURL);
         let contents = if minify {
             tmp = if resource.extension() == Some(&OsStr::new("css")) {
-                minifier::css::minify(contents).map_err(|e| {
+                minifier::css::minify(&contents).map_err(|e| {
                     Error::new(format!("failed to minify CSS file: {}", e), resource.path(self))
                 })?
             } else {
-                minifier::js::minify(contents)
+                minifier::js::minify(&contents)
             };
             tmp.as_bytes()
         } else {
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index 91243a4086ced..ae321be09e228 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -1508,11 +1508,33 @@ details.rustdoc-toggle > summary.hideme > span {
 }
 
 details.rustdoc-toggle > summary::before {
-	content: "[+]";
+	content: "Expand";
 	font-weight: 300;
 	font-size: 0.8em;
 	letter-spacing: 1px;
 	cursor: pointer;
+	width: 17px;
+	height: max(17px, 1.1em);
+	background: data-url(plus-17x17.png) no-repeat top left;
+	display: inline-block;
+	vertical-align: middle;
+	opacity: .5;
+	text-indent: 17px;
+	overflow: hidden;
+}
+
+details.rustdoc-toggle > summary.hideme::before {
+	/* "hideme" toggles already have a description when they're contracted */
+	content: " ";
+}
+
+details.rustdoc-toggle > summary:focus::before {
+	outline: dotted 1px;
+}
+
+details.rustdoc-toggle > summary:focus::before,
+details.rustdoc-toggle > summary:hover::before {
+	opacity: 1;
 }
 
 details.rustdoc-toggle.top-doc > summary,
@@ -1560,20 +1582,40 @@ details.rustdoc-toggle[open] > summary.hideme > span {
 	display: none;
 }
 
-details.rustdoc-toggle[open] > summary::before {
-	content: "[−]";
-	display: inline;
+details.rustdoc-toggle[open] > summary::before,
+details.rustdoc-toggle[open] > summary.hideme::before {
+	width: 17px;
+	height: max(17px, 1.1em);
+	background: data-url(minus-17x17.png) no-repeat top left;
+	display: inline-block;
+	content: "Collapse";
 }
 
 details.undocumented > summary::before {
-	content: "[+] Show hidden undocumented items";
+	padding-left: 17px;
+	height: max(17px, 1.1em);
+	background: data-url(plus-17x17.png) no-repeat top left;
+	content: "Show hidden undocumented items";
 	cursor: pointer;
 	font-size: 16px;
 	font-weight: 300;
+	opacity: .5;
+}
+
+details.undocumented > summary:focus::before {
+	outline: dotted 1px;
+}
+
+details.undocumented > summary:focus::before,
+details.undocumented > summary:hover::before {
+	opacity: 1;
 }
 
 details.undocumented[open] > summary::before {
-	content: "[−] Hide undocumented items";
+	padding-left: 17px;
+	height: max(17px, 1.1em);
+	background: data-url(minus-17x17.png) no-repeat top left;
+	content: "Hide undocumented items";
 }
 
 /* Media Queries */
diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css
index df386fb66a33f..849924ea5501e 100644
--- a/src/librustdoc/html/static/css/themes/ayu.css
+++ b/src/librustdoc/html/static/css/themes/ayu.css
@@ -229,6 +229,11 @@ details.undocumented > summary::before {
 	color: #999;
 }
 
+details.rustdoc-toggle > summary::before,
+details.undocumented > summary::before {
+	filter: invert(100%);
+}
+
 #crate-search {
 	color: #c5c5c5;
 	background-color: #141920;
diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css
index c8a5dbdc66aaf..c26122e4bffb5 100644
--- a/src/librustdoc/html/static/css/themes/dark.css
+++ b/src/librustdoc/html/static/css/themes/dark.css
@@ -194,6 +194,11 @@ details.undocumented > summary::before {
 	color: #999;
 }
 
+details.rustdoc-toggle > summary::before,
+details.undocumented > summary::before {
+	filter: invert(100%);
+}
+
 #crate-search {
 	color: #111;
 	background-color: #f0f0f0;
diff --git a/src/librustdoc/html/static/images/minus-17x17.png b/src/librustdoc/html/static/images/minus-17x17.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cdbbf5033ec412df28970edfc6da26d578252bf
GIT binary patch
literal 3183
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
V4juM>3j+WE002ovPDHLkV1fg@>rMaw

literal 0
HcmV?d00001

diff --git a/src/librustdoc/html/static/images/minus-17x17.png.url b/src/librustdoc/html/static/images/minus-17x17.png.url
new file mode 100644
index 0000000000000..a05bac5d875c5
--- /dev/null
+++ b/src/librustdoc/html/static/images/minus-17x17.png.url
@@ -0,0 +1 @@
+url(data:image/png;base64,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)
diff --git a/src/librustdoc/html/static/images/plus-17x17.png b/src/librustdoc/html/static/images/plus-17x17.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa996a147a5274789f8be9a0261bf2d7b8b49514
GIT binary patch
literal 3337
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
Td7i2U00000NkvXXu0mjf{gOu@

literal 0
HcmV?d00001

diff --git a/src/librustdoc/html/static/images/plus-17x17.png.url b/src/librustdoc/html/static/images/plus-17x17.png.url
new file mode 100644
index 0000000000000..dd0078d1ace7e
--- /dev/null
+++ b/src/librustdoc/html/static/images/plus-17x17.png.url
@@ -0,0 +1 @@
+url(data:image/png;base64,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)
diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index 2ec7e66234ddd..db34d60638e8a 100644
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -64,6 +64,10 @@ crate static RUST_FAVICON_SVG: &[u8] = include_bytes!("static/images/favicon.svg
 crate static RUST_FAVICON_PNG_16: &[u8] = include_bytes!("static/images/favicon-16x16.png");
 crate static RUST_FAVICON_PNG_32: &[u8] = include_bytes!("static/images/favicon-32x32.png");
 
+/// The pixel art buttons
+crate static MINUS_PNG_DATAURL: &str = include_str!("static/images/minus-17x17.png.url");
+crate static PLUS_PNG_DATAURL: &str = include_str!("static/images/plus-17x17.png.url");
+
 crate static PAGE: &str = include_str!("templates/page.html");
 
 /// The built-in themes given to every documentation site.

From 59460a655643b32fe2e1ac39279333bf5a574a82 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Sat, 17 Jul 2021 10:55:33 -0700
Subject: [PATCH 2/4] Pull the "Expand" / "Collapse" text to the end of the
 line, instead of start

---
 src/librustdoc/html/static/css/rustdoc.css | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index ae321be09e228..531484f2105b9 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -1508,10 +1508,7 @@ details.rustdoc-toggle > summary.hideme > span {
 }
 
 details.rustdoc-toggle > summary::before {
-	content: "Expand";
-	font-weight: 300;
-	font-size: 0.8em;
-	letter-spacing: 1px;
+	content: " ";
 	cursor: pointer;
 	width: 17px;
 	height: max(17px, 1.1em);
@@ -1519,13 +1516,21 @@ details.rustdoc-toggle > summary::before {
 	display: inline-block;
 	vertical-align: middle;
 	opacity: .5;
-	text-indent: 17px;
+}
+
+/* Screen readers see the text version at the end the line.
+	Visual readers see the icon at the start of the line, but small and transparent. */
+details.rustdoc-toggle > summary::after {
+	content: "Expand";
 	overflow: hidden;
+	width: 0;
+	height: 0;
+	position: absolute;
 }
 
-details.rustdoc-toggle > summary.hideme::before {
+details.rustdoc-toggle > summary.hideme::after {
 	/* "hideme" toggles already have a description when they're contracted */
-	content: " ";
+	content: "";
 }
 
 details.rustdoc-toggle > summary:focus::before {
@@ -1588,6 +1593,11 @@ details.rustdoc-toggle[open] > summary.hideme::before {
 	height: max(17px, 1.1em);
 	background: data-url(minus-17x17.png) no-repeat top left;
 	display: inline-block;
+	content: " ";
+}
+
+details.rustdoc-toggle[open] > summary::after,
+details.rustdoc-toggle[open] > summary.hideme::after {
 	content: "Collapse";
 }
 

From 64c99036600735ef2d92fcbd7e9911617b064624 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Sat, 17 Jul 2021 11:28:26 -0700
Subject: [PATCH 3/4] Use empty string instead of single space

---
 src/librustdoc/html/static/css/rustdoc.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index 531484f2105b9..0754eeb9900d1 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -1508,7 +1508,7 @@ details.rustdoc-toggle > summary.hideme > span {
 }
 
 details.rustdoc-toggle > summary::before {
-	content: " ";
+	content: "";
 	cursor: pointer;
 	width: 17px;
 	height: max(17px, 1.1em);
@@ -1593,7 +1593,7 @@ details.rustdoc-toggle[open] > summary.hideme::before {
 	height: max(17px, 1.1em);
 	background: data-url(minus-17x17.png) no-repeat top left;
 	display: inline-block;
-	content: " ";
+	content: "";
 }
 
 details.rustdoc-toggle[open] > summary::after,

From 6fe09722ea0762405558b6ea5eb5f765a24af9df Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume.gomez@huawei.com>
Date: Sat, 31 Jul 2021 16:23:51 +0200
Subject: [PATCH 4/4] Simplify usage of CSS background-image

---
 src/librustdoc/html/render/write_shared.rs    |  47 +++++++++++++++---
 src/librustdoc/html/static/css/rustdoc.css    |  20 +++-----
 .../html/static/images/minus-17x17.png        | Bin 3183 -> 0 bytes
 .../html/static/images/minus-17x17.png.url    |   1 -
 .../html/static/images/plus-17x17.png         | Bin 3337 -> 0 bytes
 .../html/static/images/plus-17x17.png.url     |   1 -
 .../html/static/images/toggle-minus.svg       |   1 +
 .../html/static/images/toggle-plus.svg        |   1 +
 src/librustdoc/html/static_files.rs           |  10 ++--
 9 files changed, 57 insertions(+), 24 deletions(-)
 delete mode 100644 src/librustdoc/html/static/images/minus-17x17.png
 delete mode 100644 src/librustdoc/html/static/images/minus-17x17.png.url
 delete mode 100644 src/librustdoc/html/static/images/plus-17x17.png
 delete mode 100644 src/librustdoc/html/static/images/plus-17x17.png.url
 create mode 100644 src/librustdoc/html/static/images/toggle-minus.svg
 create mode 100644 src/librustdoc/html/static/images/toggle-plus.svg

diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs
index f529b2f2bfcdc..4411b7771eda7 100644
--- a/src/librustdoc/html/render/write_shared.rs
+++ b/src/librustdoc/html/render/write_shared.rs
@@ -126,16 +126,13 @@ impl Context<'_> {
         emit: &[EmitType],
     ) -> Result<(), Error> {
         let tmp;
-        let contents =
-            contents.replace("data-url(minus-17x17.png)", static_files::MINUS_PNG_DATAURL);
-        let contents = contents.replace("data-url(plus-17x17.png)", static_files::PLUS_PNG_DATAURL);
         let contents = if minify {
             tmp = if resource.extension() == Some(&OsStr::new("css")) {
-                minifier::css::minify(&contents).map_err(|e| {
+                minifier::css::minify(contents).map_err(|e| {
                     Error::new(format!("failed to minify CSS file: {}", e), resource.path(self))
                 })?
             } else {
-                minifier::js::minify(&contents)
+                minifier::js::minify(contents)
             };
             tmp.as_bytes()
         } else {
@@ -178,9 +175,45 @@ pub(super) fn write_shared(
         cx.write_shared(SharedResource::InvocationSpecific { basename: p }, content, &options.emit)
     };
 
+    fn add_background_image_to_css(
+        cx: &Context<'_>,
+        css: &mut String,
+        rule: &str,
+        file: &'static str,
+    ) {
+        css.push_str(&format!(
+            "{} {{ background-image: url({}); }}",
+            rule,
+            SharedResource::ToolchainSpecific { basename: file }
+                .path(cx)
+                .file_name()
+                .unwrap()
+                .to_str()
+                .unwrap()
+        ))
+    }
+
+    // Add all the static files. These may already exist, but we just
+    // overwrite them anyway to make sure that they're fresh and up-to-date.
+    let mut rustdoc_css = static_files::RUSTDOC_CSS.to_owned();
+    add_background_image_to_css(
+        cx,
+        &mut rustdoc_css,
+        "details.undocumented[open] > summary::before, \
+         details.rustdoc-toggle[open] > summary::before, \
+         details.rustdoc-toggle[open] > summary.hideme::before",
+        "toggle-minus.svg",
+    );
+    add_background_image_to_css(
+        cx,
+        &mut rustdoc_css,
+        "details.undocumented > summary::before, details.rustdoc-toggle > summary::before",
+        "toggle-plus.svg",
+    );
+    write_minify("rustdoc.css", &rustdoc_css)?;
+
     // Add all the static files. These may already exist, but we just
     // overwrite them anyway to make sure that they're fresh and up-to-date.
-    write_minify("rustdoc.css", static_files::RUSTDOC_CSS)?;
     write_minify("settings.css", static_files::SETTINGS_CSS)?;
     write_minify("noscript.css", static_files::NOSCRIPT_CSS)?;
 
@@ -220,6 +253,8 @@ pub(super) fn write_shared(
     write_toolchain("wheel.svg", static_files::WHEEL_SVG)?;
     write_toolchain("clipboard.svg", static_files::CLIPBOARD_SVG)?;
     write_toolchain("down-arrow.svg", static_files::DOWN_ARROW_SVG)?;
+    write_toolchain("toggle-minus.svg", static_files::TOGGLE_MINUS_PNG)?;
+    write_toolchain("toggle-plus.svg", static_files::TOGGLE_PLUS_PNG)?;
 
     let mut themes: Vec<&String> = themes.iter().collect();
     themes.sort();
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index 0754eeb9900d1..4e33eab565006 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -1512,7 +1512,8 @@ details.rustdoc-toggle > summary::before {
 	cursor: pointer;
 	width: 17px;
 	height: max(17px, 1.1em);
-	background: data-url(plus-17x17.png) no-repeat top left;
+	background-repeat: no-repeat;
+	background-position: top left;
 	display: inline-block;
 	vertical-align: middle;
 	opacity: .5;
@@ -1533,10 +1534,6 @@ details.rustdoc-toggle > summary.hideme::after {
 	content: "";
 }
 
-details.rustdoc-toggle > summary:focus::before {
-	outline: dotted 1px;
-}
-
 details.rustdoc-toggle > summary:focus::before,
 details.rustdoc-toggle > summary:hover::before {
 	opacity: 1;
@@ -1591,7 +1588,8 @@ details.rustdoc-toggle[open] > summary::before,
 details.rustdoc-toggle[open] > summary.hideme::before {
 	width: 17px;
 	height: max(17px, 1.1em);
-	background: data-url(minus-17x17.png) no-repeat top left;
+	background-repeat: no-repeat;
+	background-position: top left;
 	display: inline-block;
 	content: "";
 }
@@ -1604,7 +1602,8 @@ details.rustdoc-toggle[open] > summary.hideme::after {
 details.undocumented > summary::before {
 	padding-left: 17px;
 	height: max(17px, 1.1em);
-	background: data-url(plus-17x17.png) no-repeat top left;
+	background-repeat: no-repeat;
+	background-position: top left;
 	content: "Show hidden undocumented items";
 	cursor: pointer;
 	font-size: 16px;
@@ -1612,10 +1611,6 @@ details.undocumented > summary::before {
 	opacity: .5;
 }
 
-details.undocumented > summary:focus::before {
-	outline: dotted 1px;
-}
-
 details.undocumented > summary:focus::before,
 details.undocumented > summary:hover::before {
 	opacity: 1;
@@ -1624,7 +1619,8 @@ details.undocumented > summary:hover::before {
 details.undocumented[open] > summary::before {
 	padding-left: 17px;
 	height: max(17px, 1.1em);
-	background: data-url(minus-17x17.png) no-repeat top left;
+	background-repeat: no-repeat
+	background-position: top left;
 	content: "Hide undocumented items";
 }
 
diff --git a/src/librustdoc/html/static/images/minus-17x17.png b/src/librustdoc/html/static/images/minus-17x17.png
deleted file mode 100644
index 3cdbbf5033ec412df28970edfc6da26d578252bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3183
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
V4juM>3j+WE002ovPDHLkV1fg@>rMaw

diff --git a/src/librustdoc/html/static/images/minus-17x17.png.url b/src/librustdoc/html/static/images/minus-17x17.png.url
deleted file mode 100644
index a05bac5d875c5..0000000000000
--- a/src/librustdoc/html/static/images/minus-17x17.png.url
+++ /dev/null
@@ -1 +0,0 @@
-url(data:image/png;base64,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)
diff --git a/src/librustdoc/html/static/images/plus-17x17.png b/src/librustdoc/html/static/images/plus-17x17.png
deleted file mode 100644
index fa996a147a5274789f8be9a0261bf2d7b8b49514..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3337
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
Td7i2U00000NkvXXu0mjf{gOu@

diff --git a/src/librustdoc/html/static/images/plus-17x17.png.url b/src/librustdoc/html/static/images/plus-17x17.png.url
deleted file mode 100644
index dd0078d1ace7e..0000000000000
--- a/src/librustdoc/html/static/images/plus-17x17.png.url
+++ /dev/null
@@ -1 +0,0 @@
-url(data:image/png;base64,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)
diff --git a/src/librustdoc/html/static/images/toggle-minus.svg b/src/librustdoc/html/static/images/toggle-minus.svg
new file mode 100644
index 0000000000000..73154788a0e8e
--- /dev/null
+++ b/src/librustdoc/html/static/images/toggle-minus.svg
@@ -0,0 +1 @@
+<svg width="17" height="17" shape-rendering="crispEdges" stroke="#000" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5 2.5H2.5v12H5m7-12h2.5v12H12M5 8.5h7"/></svg>
\ No newline at end of file
diff --git a/src/librustdoc/html/static/images/toggle-plus.svg b/src/librustdoc/html/static/images/toggle-plus.svg
new file mode 100644
index 0000000000000..08b17033e164b
--- /dev/null
+++ b/src/librustdoc/html/static/images/toggle-plus.svg
@@ -0,0 +1 @@
+<svg width="17" height="17" shape-rendering="crispEdges" stroke="#000" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5 2.5H2.5v12H5m7-12h2.5v12H12M5 8.5h7M8.5 12V8.625v0V5"/></svg>
\ No newline at end of file
diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index db34d60638e8a..6f3d08ea65569 100644
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -47,6 +47,12 @@ crate static CLIPBOARD_SVG: &[u8] = include_bytes!("static/images/clipboard.svg"
 /// The file contents of `down-arrow.svg`, the icon used for the crate choice combobox.
 crate static DOWN_ARROW_SVG: &[u8] = include_bytes!("static/images/down-arrow.svg");
 
+/// The file contents of `toggle-minus.svg`, the icon used for opened toggles.
+crate static TOGGLE_MINUS_PNG: &[u8] = include_bytes!("static/images/toggle-minus.svg");
+
+/// The file contents of `toggle-plus.svg`, the icon used for closed toggles.
+crate static TOGGLE_PLUS_PNG: &[u8] = include_bytes!("static/images/toggle-plus.svg");
+
 /// The contents of `COPYRIGHT.txt`, the license listing for files distributed with documentation
 /// output.
 crate static COPYRIGHT: &[u8] = include_bytes!("static/COPYRIGHT.txt");
@@ -64,10 +70,6 @@ crate static RUST_FAVICON_SVG: &[u8] = include_bytes!("static/images/favicon.svg
 crate static RUST_FAVICON_PNG_16: &[u8] = include_bytes!("static/images/favicon-16x16.png");
 crate static RUST_FAVICON_PNG_32: &[u8] = include_bytes!("static/images/favicon-32x32.png");
 
-/// The pixel art buttons
-crate static MINUS_PNG_DATAURL: &str = include_str!("static/images/minus-17x17.png.url");
-crate static PLUS_PNG_DATAURL: &str = include_str!("static/images/plus-17x17.png.url");
-
 crate static PAGE: &str = include_str!("templates/page.html");
 
 /// The built-in themes given to every documentation site.