diff options
| author | bors <bors@rust-lang.org> | 2022-01-08 06:01:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-08 06:01:37 +0000 |
| commit | 84abaf3f7dc2b7c2b453deb18890d00d28ebd844 (patch) | |
| tree | c5b746f779fe6bd06d5859d8dcd95a7fddd60fa3 /src | |
| parent | e012a191d768adeda1ee36a99ef8b92d51920154 (diff) | |
| parent | 05cfc4f4a90bb87288d5a85df401af452f2269e0 (diff) | |
| download | rust-84abaf3f7dc2b7c2b453deb18890d00d28ebd844.tar.gz rust-84abaf3f7dc2b7c2b453deb18890d00d28ebd844.zip | |
Auto merge of #92664 - ehuss:rollup-t9yrvk5, r=ehuss
Rollup of 8 pull requests
Successful merges:
- #84640 (Implement `TryFrom<char>` for `u8`)
- #92336 (Remove &self from PrintState::to_string)
- #92375 (Consolidate checking for msvc when generating debuginfo)
- #92568 (Add note about non_exhaustive to variant_count)
- #92600 (Add some missing `#[must_use]` to some `f{32,64}` operations)
- #92610 (Create CSS class instead of using inline style for search results)
- #92632 (Implement stabilization of `#[feature(available_parallelism)]`)
- #92650 (Fix typo in `StableCrateId` docs)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/static/js/main.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 28cb8ae48e2..83df3ac94a2 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -545,6 +545,10 @@ nav.sub { position: relative; } +.search-loading { + text-align: center; +} + #results > table { width: 100%; table-layout: fixed; diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index f81f6d5d61f..f41c1bd817a 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -289,8 +289,8 @@ function hideThemeButtonState() { var params = searchState.getQueryStringParams(); if (params.search !== undefined) { var search = searchState.outputElement(); - search.innerHTML = "<h3 style=\"text-align: center;\">" + - searchState.loadingText + "</h3>"; + search.innerHTML = "<h3 class=\"search-loading\">" + + searchState.loadingText + "</h3>"; searchState.showResults(search); loadSearch(); } |
