Skip to content

Commit 50b8879

Browse files
authored
Rollup merge of #55493 - GuillaumeGomez:doc-fixes, r=@QuietMisdreavus
Doc fixes Fixes the bug in source code page where code was below line numbers and fixed this bug too ("Expand description" is shown whereas it shouldn't): <img width="1440" alt="screenshot 2018-10-29 at 23 11 29" src="https://user-images.githubusercontent.com/3050060/47684136-1105ad80-dbd2-11e8-9e9f-fb7f26b0f5bd.png"> r? @QuietMisdreavus
2 parents 8b52364 + f55e986 commit 50b8879

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

src/librustdoc/html/static/main.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,7 @@
20882088
return wrapper;
20892089
}
20902090

2091-
var hideItemDeclarations = getCurrentValue('rustdoc-item-declarations') === "false";
2091+
var showItemDeclarations = getCurrentValue('rustdoc-item-declarations') === "false";
20922092
function buildToggleWrapper(e) {
20932093
if (hasClass(e, 'autohide')) {
20942094
var wrap = e.previousElementSibling;
@@ -2117,7 +2117,7 @@
21172117
if (hasClass(e, "type-decl")) {
21182118
fontSize = "20px";
21192119
otherMessage = '&nbsp;Show&nbsp;declaration';
2120-
if (hideItemDeclarations === false) {
2120+
if (showItemDeclarations === false) {
21212121
extraClass = 'collapsed';
21222122
}
21232123
} else if (hasClass(e, "sub-variant")) {
@@ -2136,12 +2136,13 @@
21362136
extraClass = "marg-left";
21372137
}
21382138

2139-
e.parentNode.insertBefore(createToggle(otherMessage,
2140-
fontSize,
2141-
extraClass,
2142-
hideItemDeclarations),
2143-
e);
2144-
if (otherMessage.length > 0 && hideItemDeclarations === true) {
2139+
e.parentNode.insertBefore(
2140+
createToggle(otherMessage,
2141+
fontSize,
2142+
extraClass,
2143+
hasClass(e, "type-decl") === false || showItemDeclarations === true),
2144+
e);
2145+
if (hasClass(e, "type-decl") === true && showItemDeclarations === true) {
21452146
collapseDocs(e.previousSibling.childNodes[0], "toggle");
21462147
}
21472148
}

src/librustdoc/html/static/rustdoc.css

+5-2
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,11 @@ nav.sub {
282282
padding-left: 0;
283283
}
284284

285-
.example-wrap {
285+
body:not(.source) .example-wrap {
286286
display: inline-flex;
287+
}
288+
289+
.example-wrap {
287290
width: 100%;
288291
}
289292

@@ -296,7 +299,7 @@ nav.sub {
296299
text-align: right;
297300
}
298301

299-
.example-wrap > pre.rust {
302+
body:not(.source) .example-wrap > pre.rust {
300303
width: 100%;
301304
}
302305

0 commit comments

Comments
 (0)