Skip to content

Commit

Permalink
Rollup merge of #103938 - notriddle:notriddle/search-results-border-b…
Browse files Browse the repository at this point in the history
…ottom, r=GuillaumeGomez

rustdoc: clean up hardcoded CSS border color on search results

Hardcoded colors in rustdoc.css should usually be avoided.

Preview: http://notriddle.com/notriddle-rustdoc-demos/border-bottom-search/test_dingus/?search=test
  • Loading branch information
matthiaskrgr authored Nov 4, 2022
2 parents 9ef3b41 + f097940 commit f35dccb
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ so that we can apply CSS-filters to change the arrow color in themes */
/* A little margin ensures the browser's outlining of focused links has room to display. */
margin-left: 2px;
margin-right: 2px;
border-bottom: 1px solid #aaa3;
border-bottom: 1px solid var(--border-color);
}

.search-results > a > div {
Expand Down Expand Up @@ -1874,7 +1874,6 @@ in storage.js

/* Display an alternating layout on tablets and phones */
.search-results > a {
border-bottom: 1px solid #aaa9;
padding: 5px 0px;
}
.search-results .result-name, .search-results div.desc {
Expand Down
18 changes: 18 additions & 0 deletions src/test/rustdoc-gui/search-result-color.goml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ assert-css: (
{"color": "rgb(0, 150, 207)"},
)

// Checking the color of the bottom border.
assert-css: (
".search-results > a",
{"border-bottom-color": "rgb(92, 103, 115)"}
)

// Checking the color of "keyword" text.
assert-css: (
"//*[@class='result-name']//*[text()='(keyword)']",
Expand Down Expand Up @@ -181,6 +187,12 @@ assert-css: (
{"color": "rgb(221, 221, 221)"},
)

// Checking the color of the bottom border.
assert-css: (
".search-results > a",
{"border-bottom-color": "rgb(224, 224, 224)"}
)

// Checking the color for "keyword" text.
assert-css: (
"//*[@class='result-name']//*[text()='(keyword)']",
Expand Down Expand Up @@ -272,6 +284,12 @@ assert-css: (
{"color": "rgb(0, 0, 0)"},
)

// Checking the color of the bottom border.
assert-css: (
".search-results > a",
{"border-bottom-color": "rgb(224, 224, 224)"}
)

// Checking the color for "keyword" text.
assert-css: (
"//*[@class='result-name']//*[text()='(keyword)']",
Expand Down

0 comments on commit f35dccb

Please sign in to comment.