rustdoc: tweak spacing in toolbar
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index fe5d35c..2dfe510 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -34,6 +34,8 @@
</g></svg>');
--button-left-margin: 4px;
--button-border-radius: 2px;
+ --toolbar-button-border-radius: 6px;
+ --code-block-border-radius: 6px;
}
/* See FiraSans-LICENSE.txt for the Fira Sans license. */
@@ -183,7 +185,7 @@
grid-template-columns: 1fr max-content;
grid-template-rows: 25px min-content min-content;
padding-bottom: 6px;
- margin-bottom: 15px;
+ margin-bottom: 11px;
}
.rustdoc-breadcrumbs {
grid-area: main-heading-breadcrumbs;
@@ -904,6 +906,7 @@
flex-grow: 0;
grid-area: main-heading-sub-heading;
line-height: 1.25;
+ padding-bottom: 4px;
}
.main-heading rustdoc-toolbar, .main-heading .out-of-band {
@@ -918,6 +921,7 @@
.docblock code, .docblock-short code,
pre, .rustdoc.src .example-wrap {
background-color: var(--code-block-background-color);
+ border-radius: var(--code-block-border-radius);
}
#main-content {
@@ -1315,14 +1319,14 @@
#settings.popover {
--popover-arrow-offset: 202px;
- top: calc(100% - 12px);
+ top: calc(100% - 16px);
}
/* use larger max-width for help popover, but not for help.html */
#help.popover {
max-width: 600px;
--popover-arrow-offset: 118px;
- top: calc(100% - 12px);
+ top: calc(100% - 16px);
}
#help dt {
@@ -1838,6 +1842,7 @@
}
#settings-menu > a, #help-button > a, button#toggle-all-docs {
width: 80px;
+ border-radius: var(--toolbar-button-border-radius);
}
#sidebar-button > a {
background-color: var(--button-background-color);
@@ -1924,6 +1929,7 @@
rustdoc-toolbar span.label {
font-size: 1rem;
flex-grow: 1;
+ padding-bottom: 4px;
}
#sidebar-button > a:before {
diff --git a/tests/rustdoc-gui/item-info.goml b/tests/rustdoc-gui/item-info.goml
index 2824a57..c8aa7b3 100644
--- a/tests/rustdoc-gui/item-info.goml
+++ b/tests/rustdoc-gui/item-info.goml
@@ -20,7 +20,7 @@
{"x": second_line_x, "y": second_line_y},
)
assert: |first_line_x| != |second_line_x| && |first_line_x| == 516 && |second_line_x| == 272
-assert: |first_line_y| != |second_line_y| && |first_line_y| == 710 && |second_line_y| == 733
+assert: |first_line_y| != |second_line_y| && |first_line_y| == 714 && |second_line_y| == 737
// Now we ensure that they're not rendered on the same line.
set-window-size: (1100, 800)
diff --git a/tests/rustdoc-gui/scrape-examples-layout.goml b/tests/rustdoc-gui/scrape-examples-layout.goml
index 803e8e4..2bf2f10 100644
--- a/tests/rustdoc-gui/scrape-examples-layout.goml
+++ b/tests/rustdoc-gui/scrape-examples-layout.goml
@@ -72,8 +72,8 @@
store-value: (offset_y, 4)
// First with desktop
-assert-position: (".scraped-example", {"y": 248})
-assert-position: (".scraped-example .prev", {"y": 248 + |offset_y|})
+assert-position: (".scraped-example", {"y": 252})
+assert-position: (".scraped-example .prev", {"y": 252 + |offset_y|})
// Gradient background should be at the top of the code block.
assert-css: (".scraped-example .example-wrap::before", {"top": "0px"})
@@ -82,8 +82,8 @@
// Then with mobile
set-window-size: (600, 600)
store-size: (".scraped-example .scraped-example-title", {"height": title_height})
-assert-position: (".scraped-example", {"y": 277})
-assert-position: (".scraped-example .prev", {"y": 277 + |offset_y| + |title_height|})
+assert-position: (".scraped-example", {"y": 281})
+assert-position: (".scraped-example .prev", {"y": 281 + |offset_y| + |title_height|})
define-function: (
"check_title_and_code_position",
