diff options
| author | bors <bors@rust-lang.org> | 2023-01-18 07:08:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-18 07:08:20 +0000 |
| commit | 74c1ad5d35c7fbdb834c42144d966279fdff3679 (patch) | |
| tree | e0c8101451bb53cd0dc6f00fec6497a71acd22f9 /src | |
| parent | aaa9bb9e7bb4b8b565f2e1570587d6c21b13ab2d (diff) | |
| parent | 788671c1c62e099b2ad4ff5384c6f764b8b26b8d (diff) | |
Auto merge of #107021 - matthiaskrgr:rollup-0dzxfyi, r=matthiaskrgr
Rollup of 7 pull requests
Successful merges:
- #106244 (Improve Markdown styling in README)
- #106747 (Add 'static lifetime suggestion when GAT implied 'static requirement from HRTB)
- #106873 (dont randomly use `_` to print out const generic arguments)
- #106992 (Remove unused `#![feature(box_syntax)]` in `alloc`)
- #106995 (bump failing assembly & codegen tests from LLVM 14 to LLVM 15)
- #106996 (rustdoc: instead of `.setting-name { width: 100% }`, use default div CSS)
- #106997 (Add heapsort fallback in `select_nth_unstable`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/static/css/settings.css | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/static/js/settings.js | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/librustdoc/html/static/css/settings.css b/src/librustdoc/html/static/css/settings.css index 91419093147..3fa47875173 100644 --- a/src/librustdoc/html/static/css/settings.css +++ b/src/librustdoc/html/static/css/settings.css @@ -33,10 +33,6 @@ padding-bottom: 1px; } -.radio-line .setting-name { - width: 100%; -} - .radio-line .choice { margin-top: 0.1em; margin-bottom: 0.1em; diff --git a/src/librustdoc/html/static/js/settings.js b/src/librustdoc/html/static/js/settings.js index 9ed8f63610f..84df1b7d391 100644 --- a/src/librustdoc/html/static/js/settings.js +++ b/src/librustdoc/html/static/js/settings.js @@ -135,7 +135,7 @@ // This is a select setting. output += `\ <div class="radio-line" id="${js_data_name}"> - <span class="setting-name">${setting_name}</span> + <div class="setting-name">${setting_name}</div> <div class="choices">`; onEach(setting["options"], option => { const checked = option === setting["default"] ? " checked" : ""; |