diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-20 18:21:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-20 18:21:49 +0100 |
| commit | c5f92ce2a075c0f656362513ebbaf19006eab047 (patch) | |
| tree | cab658b97c22a3d21cec0af024765c28b0a10d52 /src/librustdoc/html | |
| parent | db5f005f35ee8abdf772d518fea09fcadd97fb43 (diff) | |
| parent | a3ae6fec8970a09f2983bbc8db90719f11d438ca (diff) | |
| download | rust-c5f92ce2a075c0f656362513ebbaf19006eab047.tar.gz rust-c5f92ce2a075c0f656362513ebbaf19006eab047.zip | |
Rollup merge of #104611 - notriddle:notriddle/scrape-examples-button, r=GuillaumeGomez
rustdoc: use real buttons for scrape examples controls This makes the expand and switch controls keyboard-accessible. Preview: https://notriddle.com/notriddle-rustdoc-demos/scrape-examples-button/test_dingus/fn.test.html
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/sources.rs | 7 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 6 | ||||
| -rw-r--r-- | src/librustdoc/html/templates/page.html | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 8731efb5e87..647eb69d9a6 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -2915,7 +2915,7 @@ fn render_call_locations(w: &mut Buffer, cx: &mut Context<'_>, item: &clean::Ite ); if line_ranges.len() > 1 { - write!(w, r#"<span class="prev">≺</span> <span class="next">≻</span>"#); + write!(w, r#"<button class="prev">≺</button> <button class="next">≻</button>"#); } // Look for the example file in the source map if it exists, otherwise return a dummy span diff --git a/src/librustdoc/html/sources.rs b/src/librustdoc/html/sources.rs index 50135d60190..54e296959b0 100644 --- a/src/librustdoc/html/sources.rs +++ b/src/librustdoc/html/sources.rs @@ -287,8 +287,11 @@ pub(crate) fn print_src( } } SourceContext::Embedded { offset, needs_expansion } => { - extra = - if needs_expansion { Some(r#"<span class="expand">↕</span>"#) } else { None }; + extra = if needs_expansion { + Some(r#"<button class="expand">↕</button>"#) + } else { + None + }; for line_number in 1..=lines { let line = line_number + offset; writeln!(line_numbers, "<span>{line}</span>") diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index e1234b37f4e..10f3c0e95d7 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1965,6 +1965,12 @@ in storage.js top: 0.25em; z-index: 1; cursor: pointer; + padding: 0; + background: none; + border: none; + /* iOS button gradient: https://stackoverflow.com/q/5438567 */ + -webkit-appearance: none; + opacity: 1; } .scraped-example .code-wrapper .prev { right: 2.25em; diff --git a/src/librustdoc/html/templates/page.html b/src/librustdoc/html/templates/page.html index 4efcfc510a2..df13e597f1f 100644 --- a/src/librustdoc/html/templates/page.html +++ b/src/librustdoc/html/templates/page.html @@ -40,7 +40,7 @@ {%- endif -%} <script defer src="{{static_root_path|safe}}{{files.main_js}}"></script> {#- -#} {%- if layout.scrape_examples_extension -%} - <script defer src="{{page.root_path|safe}}{{files.scrape_examples_js}}"></script> {#- -#} + <script defer src="{{static_root_path|safe}}{{files.scrape_examples_js}}"></script> {#- -#} {%- endif -%} <noscript> {#- -#} <link rel="stylesheet" {# -#} |
