Skip to content

Fixes some style issues in rustdoc "implementations on Foreign types" #51193

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 1 commit into from
May 31, 2018
Merged

Fixes some style issues in rustdoc "implementations on Foreign types" #51193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/librustdoc/html/static/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,7 @@
onEach(e.getElementsByClassName('associatedconstant'), func);
});

function createToggle(otherMessage) {
function createToggle(otherMessage, extraClass) {
var span = document.createElement('span');
span.className = 'toggle-label';
span.style.display = 'none';
Expand All @@ -1995,6 +1995,9 @@

var wrapper = document.createElement('div');
wrapper.className = 'toggle-wrapper';
if (extraClass) {
wrapper.className += ' ' + extraClass;
}
wrapper.appendChild(mainToggle);
return wrapper;
}
Expand Down Expand Up @@ -2023,10 +2026,13 @@
}
if (e.parentNode.id === "main") {
var otherMessage;
var extraClass;
if (hasClass(e, "type-decl")) {
otherMessage = ' Show declaration';
} else if (hasClass(e.childNodes[0], "impl-items")) {
extraClass = "marg-left";
}
e.parentNode.insertBefore(createToggle(otherMessage), e);
e.parentNode.insertBefore(createToggle(otherMessage, extraClass), e);
if (otherMessage && getCurrentValue('rustdoc-item-declarations') !== "false") {
collapseDocs(e.previousSibling.childNodes[0], "toggle");
}
Expand Down
23 changes: 21 additions & 2 deletions src/librustdoc/html/static/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,11 +474,30 @@ h4 > code, h3 > code, .invisible > code {
margin-bottom: 15px;
}

.content .impl-items .method, .content .impl-items > .type, .impl-items > .associatedconstant {
margin-left: 20px;
}
.content .impl-items .docblock, .content .impl-items .stability {
margin-bottom: .6em;
}
.content .impl-items .method, .content .impl-items > .type, .impl-items > .associatedconstant {
.content .docblock > .impl-items {
margin-left: 20px;
margin-top: -34px;
}
.content .docblock > .impl-items > h4 {
border-bottom: 0;
}
.content .docblock >.impl-items .table-display {
margin: 0;
}
.content .docblock >.impl-items table td {
padding: 0;
}
.toggle-wrapper.marg-left > .collapse-toggle {
left: -24px;
}
.content .docblock > .impl-items .table-display, .impl-items table td {
border: none;
}

.content .stability code {
Expand Down Expand Up @@ -542,7 +561,7 @@ a {
content: '\2002\00a7\2002';
}

.docblock a:hover, .docblock-short a:hover, .stability a {
.docblock a:not(.srclink):hover, .docblock-short a:not(.srclink):hover, .stability a {
text-decoration: underline;
}

Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/html/static/themes/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.t
background: rgba(0, 0, 0, 0);
}

.docblock code, .docblock-short code {
.docblock p > code, .docblock-short p > code {
background-color: #2A2A2A;
}
pre {
Expand Down Expand Up @@ -163,7 +163,7 @@ a {
color: #ddd;
}

.docblock a, .docblock-short a, .stability a {
.docblock a:not(.srclink), .docblock-short a:not(.srclink), .stability a {
color: #D2991D;
}

Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/html/static/themes/light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.t
background: rgba(0, 0, 0, 0);
}

.docblock code, .docblock-short code {
.docblock p > code, .docblock-short p > code {
background-color: #F5F5F5;
}
pre {
Expand Down Expand Up @@ -163,7 +163,7 @@ a {
color: #000;
}

.docblock a, .docblock-short a, .stability a {
.docblock a:not(.srclink), .docblock-short a:not(.srclink), .stability a {
color: #3873AD;
}

Expand Down