Skip to content

[rustdoc] Unify variant struct fields margins with struct fields #132258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2024
+8 −7
Merged

[rustdoc] Unify variant struct fields margins with struct fields #132258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cfbe23
Unify variant struct fields margins with struct fields
GuillaumeGomez Oct 28, 2024
26b6ccd
Add GUI regression test for variant structfields margins
GuillaumeGomez Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/css/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ h4.code-header {
padding: 0;
white-space: pre-wrap;
}
.structfield {
.structfield, .sub-variant-field {
margin: 0.6em 0;
}

Expand Down
13 changes: 7 additions & 6 deletions tests/rustdoc-gui/fields.goml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// This test checks that fields are displayed as expected (one by line) and they are surrounded
// by margins.

store-value: (margin, "9.6px")
define-function: (
"check-fields",
[path, selector_1, selector_2],
Expand All @@ -12,8 +13,8 @@ define-function: (

// Check the margins.
assert-css: (".structfield.section-header", {
"margin-top": "9.6px",
"margin-bottom": "9.6px",
"margin-top": |margin|,
"margin-bottom": |margin|,
"margin-left": "0px",
"margin-right": "0px",
}, ALL)
Expand Down Expand Up @@ -41,9 +42,9 @@ store-position: ("#variant\.B\.field\.b", {"y": b_y})
assert: |a_y| < |b_y|

// Check the margins.
assert-css: (".sub-variant-field .section-header", {
"margin-top": "0px",
"margin-bottom": "0px",
"margin-left": "0px",
assert-css: (".sub-variant-field", {
"margin-top": |margin|,
"margin-bottom": |margin|,
"margin-left": "24px",
"margin-right": "0px",
}, ALL)
Loading