diff options
| author | bors <bors@rust-lang.org> | 2017-09-18 17:30:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-18 17:30:29 +0000 |
| commit | 0701b37d97d08da7074ece7a7dcb4449498f4bfa (patch) | |
| tree | 796f1ce756d1bce72a8462d6d74c28f11263895c /src/librustdoc/html | |
| parent | 3a7b960731fd1cf86f1879b1a0d44196a0917c53 (diff) | |
| parent | 929215db7c598722410709022e69f71702f02e0b (diff) | |
| download | rust-0701b37d97d08da7074ece7a7dcb4449498f4bfa.tar.gz rust-0701b37d97d08da7074ece7a7dcb4449498f4bfa.zip | |
Auto merge of #44678 - alexcrichton:rollup, r=alexcrichton
Rollup of 11 pull requests - Successful merges: #44364, #44466, #44537, #44548, #44640, #44651, #44657, #44661, #44668, #44671, #44675 - Failed merges:
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/render.rs | 8 | ||||
| -rw-r--r-- | src/librustdoc/html/static/rustdoc.css | 17 |
2 files changed, 20 insertions, 5 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index c09ce4c4bd3..bf0fe5f6e9d 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -2671,8 +2671,9 @@ fn item_struct(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, let ns_id = derive_id(format!("{}.{}", field.name.as_ref().unwrap(), ItemType::StructField.name_space())); - write!(w, "<span id='{id}' class=\"{item_type}\"> - <span id='{ns_id}' class='invisible'> + write!(w, "<span id=\"{id}\" class=\"{item_type} small-section-header\"> + <a href=\"#{id}\" class=\"anchor field\"></a> + <span id=\"{ns_id}\" class='invisible'> <code>{name}: {ty}</code> </span></span>", item_type = ItemType::StructField, @@ -2793,7 +2794,8 @@ fn item_enum(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, let ns_id = derive_id(format!("{}.{}", variant.name.as_ref().unwrap(), ItemType::Variant.name_space())); - write!(w, "<span id='{id}' class='variant'>\ + write!(w, "<span id=\"{id}\" class=\"variant small-section-header\">\ + <a href=\"#{id}\" class=\"anchor field\"></a>\ <span id='{ns_id}' class='invisible'><code>{name}", id = id, ns_id = ns_id, diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index c15051376bf..5727d3c5f70 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -288,6 +288,7 @@ nav.sub { .docblock { margin-left: 24px; + position: relative; } .content .out-of-band { @@ -456,8 +457,13 @@ a { } .anchor { display: none; + position: absolute; + left: -25px; } -.anchor:after { +.anchor.field { + left: -20px; +} +.anchor:before { content: '\2002\00a7\2002'; } @@ -625,7 +631,9 @@ a.test-arrow:hover{ text-decoration: none; } -.section-header:hover a:after { +.section-header:hover a:before { + position: absolute; + left: -25px; content: '\2002\00a7\2002'; } @@ -817,6 +825,7 @@ span.since { position: absolute; left: -1px; margin-top: 7px; + z-index: 1; } .tooltip { @@ -853,3 +862,7 @@ span.since { border-style: solid; border-color: transparent black transparent transparent; } + +pre.rust { + position: relative; +} |
