rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #36293 - liigo:docblock-short, r=steveklabnik

Browse Source 
rustdoc: don't collapse `docblock-short`

![docblock-short](https://cloud.githubusercontent.com/assets/346530/18267298/137d2542-7451-11e6-9c8e-dd4e1f1fea29.png)
This commit is contained in:
bors
2016-09-14 15:39:23 -07:00
committed by GitHub
parent 5bdf79bf37 26d5f99ec0
commit 6ffdda1ba1
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustdoc/html/render.rs
View File

@@ -1846,7 +1846,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
<tr class='{stab} module-item'> <tr class='{stab} module-item'>
<td><a class='{class}' href='{href}' <td><a class='{class}' href='{href}'
title='{title}'>{name}</a></td> title='{title}'>{name}</a></td>
<td class='docblock short'> <td class='docblock-short'>
{stab_docs} {docs} {stab_docs} {docs}
</td> </td>
</tr>", </tr>",

14
src/librustdoc/html/static/rustdoc.css
View File

@@ -130,11 +130,11 @@ code, pre {
font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", Inconsolata, monospace; font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", Inconsolata, monospace;
white-space: pre-wrap; white-space: pre-wrap;
} }
.docblock code { .docblock code, .docblock-short code {
border-radius: 3px; border-radius: 3px;
padding: 0 0.2em; padding: 0 0.2em;
} }
.docblock pre code { .docblock pre code, .docblock-short pre code {
padding: 0; padding: 0;
} }
pre { pre {
@@ -239,23 +239,23 @@ nav.sub {
} }
.line-numbers span { cursor: pointer; } .line-numbers span { cursor: pointer; }
.docblock.short p { .docblock-short p {
display: inline; display: inline;
} }
.docblock.short.nowrap { .docblock-short.nowrap {
display: block; display: block;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.docblock.short p { .docblock-short p {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin: 0; margin: 0;
} }
.docblock.short code { white-space: nowrap; } .docblock-short code { white-space: nowrap; }
.docblock h1, .docblock h2, .docblock h3, .docblock h4, .docblock h5 { .docblock h1, .docblock h2, .docblock h3, .docblock h4, .docblock h5 {
border-bottom: 1px solid; border-bottom: 1px solid;
@@ -409,7 +409,7 @@ a {
background: transparent; background: transparent;
} }
.docblock a:hover, .stability a { .docblock a:hover, .docblock-short a:hover, .stability a {
text-decoration: underline; text-decoration: underline;
} }

4
src/librustdoc/html/static/styles/main.css
View File

@@ -34,7 +34,7 @@ div.stability > em > code {
background-color: initial; background-color: initial;
} }
.docblock code { .docblock code, .docblock-short code {
background-color: #F5F5F5; background-color: #F5F5F5;
} }
pre { pre {
@@ -113,7 +113,7 @@ a {
color: #000; color: #000;
} }
.docblock a, .stability a { .docblock a, .docblock-short a, .stability a {
color: #3873AD; color: #3873AD;
} }

2
src/test/rustdoc/issue-32374.rs
View File

@@ -13,7 +13,7 @@
#![unstable(feature="test", issue = "32374")] #![unstable(feature="test", issue = "32374")]
// @has issue_32374/index.html '//*[@class="docblock short"]' \ // @has issue_32374/index.html '//*[@class="docblock-short"]' \
// '[Deprecated] [Unstable]' // '[Deprecated] [Unstable]'
// @has issue_32374/struct.T.html '//*[@class="stab deprecated"]' \ // @has issue_32374/struct.T.html '//*[@class="stab deprecated"]' \