mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #107045 - notriddle:notriddle/settings-css-setting-line, r=GuillaumeGomez

Browse Source 
rustdoc: remove redundant CSS rule `#settings .setting-line`

Since the current version of settings.js always nests things below a div with ID `settings`, this rule always overrode the one above.
This commit is contained in:
Michael Goulet 2023-01-18 18:00:31 -05:00 committed by GitHub
commit e12c6b277f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustdoc/html/static/css/settings.css
View File

@ -1,5 +1,5 @@
.setting-line {
margin: 0.6em 0 0.6em 0.3em;
margin: 1.2em 0.6em;
position: relative;
}
@ -55,10 +55,6 @@
cursor: pointer;
}
#settings .setting-line {
margin: 1.2em 0.6em;
}
.setting-line .radio-line input:checked {
box-shadow: inset 0 0 0 3px var(--main-background-color);
background-color: var(--settings-input-color);

7
tests/rustdoc-gui/settings.goml
View File

@ -8,6 +8,10 @@ assert-false: "#settings"
click: "#settings-menu"
wait-for: "#settings"
assert-css: ("#settings", {"display": "block"})
// Store the line margin to compare with the settings.html later.
store-css: (setting_line_margin, ".setting-line", "margin")
// Let's close it by clicking on the same button.
click: "#settings-menu"
wait-for-css: ("#settings", {"display": "none"})
@ -230,6 +234,9 @@ assert-css: (".setting-line", {"position": "relative"})
assert-attribute-false: ("#settings", {"class": "popover"}, CONTAINS)
compare-elements-position: (".sub form", "#settings", ("x"))
// Check that setting-line has the same margin in this mode as in the popover.
assert-css: (".setting-line", {"margin": |setting_line_margin|})
// We now check the display with JS disabled.
assert-false: "noscript section"
javascript: false