diff options
| author | Michael Howell <michael@notriddle.com> | 2022-11-04 13:19:33 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2022-11-04 13:19:33 -0700 |
| commit | 4bd6748bb9b73c210558498070ae0b7ed8193ddf (patch) | |
| tree | 7d7a43d9bc7056bda3168a8ed7f411717920382d | |
| parent | b30c4d1932f7c547a431d2a67f939a8305644fdc (diff) | |
| download | rust-4bd6748bb9b73c210558498070ae0b7ed8193ddf.tar.gz rust-4bd6748bb9b73c210558498070ae0b7ed8193ddf.zip | |
rustdoc: get rid of CSS/DOM `div.desc span`, which isn't really needed
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 15 | ||||
| -rw-r--r-- | src/librustdoc/html/static/js/search.js | 4 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/search-result-color.goml | 8 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 227d9ac464b..7c0dab1c527 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -881,13 +881,6 @@ so that we can apply CSS-filters to change the arrow color in themes */ display: block; } -.search-results .desc > span { - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - display: block; -} - .search-results > a { display: flex; /* A little margin ensures the browser's outlining of focused links has room to display. */ @@ -899,7 +892,13 @@ so that we can apply CSS-filters to change the arrow color in themes */ .search-results > a > div { flex: 1; +} + +.search-results > a > div.desc { + white-space: nowrap; + text-overflow: ellipsis; overflow: hidden; + display: block; } .search-results a:hover, @@ -1870,7 +1869,7 @@ in storage.js .search-results > a { padding: 5px 0px; } - .search-results div.desc, .item-right { + .search-results > a > div.desc, .item-right { padding-left: 2em; } diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index ef3c74f5faa..dd0531c5e70 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -1617,10 +1617,8 @@ function initSearch(rawSearchIndex) { const description = document.createElement("div"); description.className = "desc"; - const spanDesc = document.createElement("span"); - spanDesc.insertAdjacentHTML("beforeend", item.desc); + description.insertAdjacentHTML("beforeend", item.desc); - description.appendChild(spanDesc); link.appendChild(description); output.appendChild(link); }); diff --git a/src/test/rustdoc-gui/search-result-color.goml b/src/test/rustdoc-gui/search-result-color.goml index 37d7b03a099..0c3b1119074 100644 --- a/src/test/rustdoc-gui/search-result-color.goml +++ b/src/test/rustdoc-gui/search-result-color.goml @@ -67,7 +67,7 @@ reload: // Waiting for the search results to appear... wait-for: "#titles" assert-css: ( - "//*[@class='desc']//*[text()='Just a normal struct.']", + "//*[@class='desc'][text()='Just a normal struct.']", {"color": "rgb(197, 197, 197)"}, ) assert-css: ( @@ -159,7 +159,7 @@ assert-css: ( ) // Checking color and background on hover. -move-cursor-to: "//*[@class='desc']//*[text()='Just a normal struct.']" +move-cursor-to: "//*[@class='desc'][text()='Just a normal struct.']" assert-css: ( "//*[@class='result-name']/*[text()='test_docs::']", {"color": "rgb(255, 255, 255)"}, @@ -179,7 +179,7 @@ reload: // Waiting for the search results to appear... wait-for: "#titles" assert-css: ( - "//*[@class='desc']//*[text()='Just a normal struct.']", + "//*[@class='desc'][text()='Just a normal struct.']", {"color": "rgb(221, 221, 221)"}, ) assert-css: ( @@ -276,7 +276,7 @@ reload: // Waiting for the search results to appear... wait-for: "#titles" assert-css: ( - "//*[@class='desc']//*[text()='Just a normal struct.']", + "//*[@class='desc'][text()='Just a normal struct.']", {"color": "rgb(0, 0, 0)"}, ) assert-css: ( |