diff options
| author | bors <bors@rust-lang.org> | 2019-02-20 10:14:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-20 10:14:28 +0000 |
| commit | f66e4697ae286985ddefc53c3a047614568458bb (patch) | |
| tree | 656e63ba3f96698e771c822a90670f7eb608aa51 /src/librustdoc/html/static | |
| parent | 74e35d270067afff72034312065c48e6d8cfba67 (diff) | |
| parent | a1a17f5c6663a6a22a58505a6a925b44dfc016e9 (diff) | |
Auto merge of #58578 - kennytm:rollup, r=kennytm
Rollup of 24 pull requests
Successful merges:
- #56470 (Modify doctest's auto-`fn main()` to allow `Result`s)
- #58044 (Make overflowing and wrapping negation const)
- #58303 (Improve stability tags display)
- #58336 (Fix search results interactions)
- #58384 (Fix tables display)
- #58392 (Use less explicit shifting in std::net::ip)
- #58409 (rustdoc: respect alternate flag when formatting impl trait)
- #58456 (Remove no longer accurate diagnostic code about NLL)
- #58528 (Don't use an allocation for ItemId in StmtKind)
- #58530 (Monomorphize less code in fs::{read|write})
- #58534 (Mention capping forbid lints)
- #58536 (Remove UB in pointer tests)
- #58538 (Add missing fmt structs examples)
- #58539 (Add alias methods to PathBuf for underlying OsString (#58234))
- #58544 (Fix doc for rustc "-g" flag)
- #58545 (Add regression test for a specialization-related ICE (#39448))
- #58546 (librustc_codegen_llvm => 2018)
- #58551 (Explain a panic in test case net::tcp::tests::double_bind)
- #58553 (Use more impl header lifetime elision)
- #58562 (Fix style nits)
- #58565 (Fix typo in std::future::Future docs)
- #58568 (Fix a transposition in driver.rs.)
- #58569 (Reduce Some Code Repetitions like `(n << amt) >> amt`)
- #58576 (Stabilize iter::successors and iter::from_fn)
Diffstat (limited to 'src/librustdoc/html/static')
| -rw-r--r-- | src/librustdoc/html/static/main.js | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/static/rustdoc.css | 5 | ||||
| -rw-r--r-- | src/librustdoc/html/static/themes/dark.css | 22 | ||||
| -rw-r--r-- | src/librustdoc/html/static/themes/light.css | 22 |
4 files changed, 17 insertions, 36 deletions
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index ff28c4f40bc..1849e53d937 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -1196,7 +1196,7 @@ if (!DOMTokenList.prototype.remove) { var actives = [[], [], []]; // "current" is used to know which tab we're looking into. var current = 0; - onEachLazy(document.getElementsByClassName("search-results"), function(e) { + onEachLazy(document.getElementById("results").childNodes, function(e) { onEachLazy(e.getElementsByClassName("highlighted"), function(e) { actives[current].push(e); }); @@ -1213,7 +1213,7 @@ if (!DOMTokenList.prototype.remove) { removeClass(actives[currentTab][0], "highlighted"); } else if (e.which === 40) { // down if (!actives[currentTab].length) { - var results = document.getElementsByClassName("search-results"); + var results = document.getElementById("results").childNodes; if (results.length > 0) { var res = results[currentTab].getElementsByClassName("result"); if (res.length > 0) { diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 4ec8637cc71..787f3c7f480 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -424,7 +424,8 @@ h4 > code, h3 > code, .invisible > code { .docblock table { margin: .5em 0; - width: 100%; + width: calc(100% - 2px); + border: 1px dashed; } .docblock table td { @@ -657,7 +658,7 @@ a { transition: border-color 300ms ease; transition: border-radius 300ms ease-in-out; transition: box-shadow 300ms ease-in-out; - width: 100%; + width: calc(100% - 32px); } #crate-search + .search-input { diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css index 333fe76a8a4..e756ab60ccc 100644 --- a/src/librustdoc/html/static/themes/dark.css +++ b/src/librustdoc/html/static/themes/dark.css @@ -68,20 +68,10 @@ pre { border-bottom-color: #DDD; } -.docblock table { +.docblock table, .docblock table td, .docblock table th { border-color: #ddd; } -.docblock table td { - border-top-color: #ddd; - border-bottom-color: #ddd; -} - -.docblock table th { - border-top-color: #ddd; - border-bottom-color: #ddd; -} - .content .method .where, .content .fn .where, .content .where.fmt-newline { @@ -190,15 +180,15 @@ a.test-arrow { box-shadow: 1px 0 0 1px #000, 0 0 0 2px transparent; } -.stab.unstable { background: #FFF5D6; border-color: #FFC600; color: #404040; } -.stab.internal { background: #FFB9B3; border-color: #B71C1C; color: #404040; } -.stab.deprecated { background: #F3DFFF; border-color: #7F0087; color: #404040; } -.stab.portability { background: #C4ECFF; border-color: #7BA5DB; color: #404040; } - .module-item .stab { color: #ddd; } +.stab.unstable {background: #FFF5D6; border-color: #FFC600; color: #2f2f2f; } +.stab.internal { background: #FFB9B3; border-color: #B71C1C; color: #2f2f2f; } +.stab.deprecated { background: #F3DFFF; border-color: #7F0087; color: #2f2f2f; } +.stab.portability { background: #C4ECFF; border-color: #7BA5DB; color: #2f2f2f; } + #help > div { background: #4d4d4d; border-color: #bfbfbf; diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css index 19ae67b2988..a294f6f2ff1 100644 --- a/src/librustdoc/html/static/themes/light.css +++ b/src/librustdoc/html/static/themes/light.css @@ -67,21 +67,11 @@ pre { } .docblock h1, .docblock h2, .docblock h3, .docblock h4, .docblock h5 { - border-bottom-color: #DDD; -} - -.docblock table { - border-color: #ddd; -} - -.docblock table td { - border-top-color: #ddd; border-bottom-color: #ddd; } -.docblock table th { - border-top-color: #ddd; - border-bottom-color: #ddd; +.docblock table, .docblock table td, .docblock table th { + border-color: #ddd; } .content .method .where, @@ -191,15 +181,15 @@ a.test-arrow { box-shadow: 1px 0 0 1px #e0e0e0, 0 0 0 2px transparent; } +.module-item .stab { + color: #000; +} + .stab.unstable { background: #FFF5D6; border-color: #FFC600; } .stab.internal { background: #FFB9B3; border-color: #B71C1C; } .stab.deprecated { background: #F3DFFF; border-color: #7F0087; } .stab.portability { background: #C4ECFF; border-color: #7BA5DB; } -.module-item .stab { - color: #000; -} - #help > div { background: #e9e9e9; border-color: #bfbfbf; |
