diff options
| author | Takayuki Maeda <takoyaki0316@gmail.com> | 2023-06-29 03:29:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-29 03:29:33 +0900 |
| commit | 5871bc84867102d0ca8302557c6544878801d83e (patch) | |
| tree | c6791a28d7820b31c07362c8b87e167db42842ba /src/librustdoc/html/static | |
| parent | 376c944bd2ac9cdc5b4742301bbbef032d4ab2d3 (diff) | |
| parent | a716c79c29a8fe5eb3b7e04e736c596d9fbd29dc (diff) | |
Rollup merge of #113100 - GuillaumeGomez:search-result-long-name, r=notriddle
Fix display of long items in search results Fixes https://github.com/rust-lang/rust/issues/113060. You can test the result [here](https://rustdoc.crud.net/imperio/search-result-long-name/lib2/index.html). To make it a bit better, I also reduced a bit the size of the short documentation from half to 2 fifth of the width. r? `@notriddle`
Diffstat (limited to 'src/librustdoc/html/static')
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 30 | ||||
| -rw-r--r-- | src/librustdoc/html/static/js/search.js | 8 |
2 files changed, 29 insertions, 9 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index b6d90091bba..ccfd4cc5b87 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -8,6 +8,7 @@ :root { --nav-sub-mobile-padding: 8px; + --search-typename-width: 6.75rem; } /* See FiraSans-LICENSE.txt for the Fira Sans license. */ @@ -869,14 +870,11 @@ so that we can apply CSS-filters to change the arrow color in themes */ gap: 1em; } -.search-results > a > div { - flex: 1; -} - .search-results > a > div.desc { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + flex: 2; } .search-results a:hover, @@ -884,6 +882,12 @@ so that we can apply CSS-filters to change the arrow color in themes */ background-color: var(--search-result-link-focus-background-color); } +.search-results .result-name { + display: flex; + align-items: center; + justify-content: start; + flex: 3; +} .search-results .result-name span.alias { color: var(--search-results-alias-color); } @@ -891,10 +895,14 @@ so that we can apply CSS-filters to change the arrow color in themes */ color: var(--search-results-grey-color); } .search-results .result-name .typename { - display: inline-block; color: var(--search-results-grey-color); font-size: 0.875rem; - width: 6.25rem; + width: var(--search-typename-width); +} +.search-results .result-name .path { + word-break: break-all; + max-width: calc(100% - var(--search-typename-width)); + display: inline-block; } .popover { @@ -1730,6 +1738,16 @@ in source-script.js .search-results > a > div.desc, .item-table > li > div.desc { padding-left: 2em; } + .search-results .result-name { + display: block; + } + .search-results .result-name .typename { + width: initial; + margin-right: 0; + } + .search-results .result-name .typename, .search-results .result-name .path { + display: inline; + } .source-sidebar-expanded .source .sidebar { max-width: 100vw; diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index b8cc0a6db71..345750395f0 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -2024,9 +2024,11 @@ function initSearch(rawSearchIndex) { resultName.insertAdjacentHTML( "beforeend", - `<span class="typename">${typeName}</span>` - + ` ${item.displayPath}<span class="${type}">${name}</span>` - ); + `\ +<span class="typename">${typeName}</span>\ +<div class="path">\ + ${item.displayPath}<span class="${type}">${name}</span>\ +</div>`); link.appendChild(resultName); const description = document.createElement("div"); |
