diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-05 18:06:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 18:06:07 +0100 |
| commit | e51e4a4ecf6c0b60bac71ac310b773c057e2cd1a (patch) | |
| tree | 95bc243b8344a6f4efdccc70d7658bfa2974fcff | |
| parent | cf2d88db3840dd46bb6897978a3adc421769d5f9 (diff) | |
| parent | 666873b1bb0b7c6663e9be7fc012c5467d873ae3 (diff) | |
| download | rust-e51e4a4ecf6c0b60bac71ac310b773c057e2cd1a.tar.gz rust-e51e4a4ecf6c0b60bac71ac310b773c057e2cd1a.zip | |
Rollup merge of #103988 - GuillaumeGomez:fix-bottom-border-color, r=notriddle
Fix search result bottom border color It reverts a color change while keeping the improvement made in #103938. I think it'll need to be backported once merged too. r? `@notriddle`
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/ayu.css | 1 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/dark.css | 1 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/light.css | 1 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/search-result-color.goml | 6 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 61a50a9bd13..9ee926e1ab0 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -886,7 +886,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 var(--border-color); + border-bottom: 1px solid var(--search-result-border-color); gap: 1em; } diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index fdfdb3e1966..762384481e6 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -38,6 +38,7 @@ Original by Dempfi (https://github.com/dempfi/ayu) --sidebar-link-color: #53b1db; --sidebar-current-link-background-color: transparent; --search-result-link-focus-background-color: #3c3c3c; + --search-result-border-color: #aaa3; --stab-background-color: #314559; --stab-code-color: #e6e1cf; --search-color: #fff; diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index 361d3d4a225..1424de5137c 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -33,6 +33,7 @@ --sidebar-link-color: #fdbf35; --sidebar-current-link-background-color: #444; --search-result-link-focus-background-color: #616161; + --search-result-border-color: #aaa3; --stab-background-color: #314559; --stab-code-color: #e6e1cf; --search-color: #111; diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index 5eb4bbcf834..a7ce56c95c7 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -33,6 +33,7 @@ --sidebar-link-color: #356da4; --sidebar-current-link-background-color: #fff; --search-result-link-focus-background-color: #ccc; + --search-result-border-color: #aaa3; --stab-background-color: #fff5d6; --stab-code-color: #000; --search-color: #000; diff --git a/src/test/rustdoc-gui/search-result-color.goml b/src/test/rustdoc-gui/search-result-color.goml index 0c3b1119074..d437ad75970 100644 --- a/src/test/rustdoc-gui/search-result-color.goml +++ b/src/test/rustdoc-gui/search-result-color.goml @@ -78,7 +78,7 @@ assert-css: ( // Checking the color of the bottom border. assert-css: ( ".search-results > a", - {"border-bottom-color": "rgb(92, 103, 115)"} + {"border-bottom-color": "rgba(170, 170, 170, 0.2)"} ) // Checking the color of "keyword" text. @@ -190,7 +190,7 @@ assert-css: ( // Checking the color of the bottom border. assert-css: ( ".search-results > a", - {"border-bottom-color": "rgb(224, 224, 224)"} + {"border-bottom-color": "rgba(170, 170, 170, 0.2)"} ) // Checking the color for "keyword" text. @@ -287,7 +287,7 @@ assert-css: ( // Checking the color of the bottom border. assert-css: ( ".search-results > a", - {"border-bottom-color": "rgb(224, 224, 224)"} + {"border-bottom-color": "rgba(170, 170, 170, 0.2)"} ) // Checking the color for "keyword" text. |
