about summary refs log tree commit diff
path: root/src/librustdoc/html/static/main.css
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-16 20:34:55 +0000
committerbors <bors@rust-lang.org>2015-04-16 20:34:55 +0000
commit1014ac44f6271a55249b0488a2ce1cc49deed338 (patch)
treec827a7db48525741f0e91758c1df38082bee30aa /src/librustdoc/html/static/main.css
parente9080ec39d9a44eb0773d648b348575b19f655e5 (diff)
parent71c1b5b704ca3955e5ca22d77a0d59b55c9af4f1 (diff)
Auto merge of #24396 - alexcrichton:rustdoc2, r=aturon
A few final improvements to rustdoc for 1.0:

* Improve how rustdoc handles stability
* Fix cross-crate macro source links
* Improve experience of types inheriting methods through `Deref`

Some more details can be found in the commits.

[Preview](http://people.mozilla.org/~acrichton/doc/std/)
Diffstat (limited to 'src/librustdoc/html/static/main.css')
-rw-r--r--src/librustdoc/html/static/main.css63
1 files changed, 34 insertions, 29 deletions
diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 2af20ce59da..c94dbc15103 100644
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -245,6 +245,10 @@ nav.sub {
 .content .highlighted.tymethod { background-color: #c6afb3; }
 .content .highlighted.type { background-color: #c6afb3; }
 
+.docblock.short p {
+    display: inline;
+}
+
 .docblock.short.nowrap {
     display: block;
     overflow: hidden;
@@ -337,11 +341,16 @@ nav.sub {
 /* Shift "where ..." part of method definition down a line */
 .content .method .where { display: block; }
 /* Bit of whitespace to indent it */
-.content .method .where::before { content: '      '; }
+.content .method .where::before { content: '  '; }
 
-.content .methods .docblock { margin-left: 40px; }
+.content .methods > div { margin-left: 40px; }
 
-.content .impl-items .docblock { margin-left: 40px; }
+.content .impl-items .docblock, .content .impl-items .stability {
+    margin-left: 40px;
+}
+.content .impl-items .method, .content .impl-items .type {
+    margin-left: 20px;
+}
 
 nav {
     border-bottom: 1px solid #e0e0e0;
@@ -468,30 +477,31 @@ a {
     padding: 20px;
 }
 
-.stability {
-    border-left: 6px solid;
-    padding: 3px 6px;
-    border-radius: 3px;
+em.stab.unstable { background: #FFF5D6; border-color: #FFC600; }
+em.stab.deprecated { background: #F3DFFF; border-color: #7F0087; }
+em.stab {
+    display: inline-block;
+    border-width: 1px;
+    border-style: solid;
+    padding: 3px;
+    margin-bottom: 5px;
+    font-size: 90%;
+    font-style: normal;
 }
-
-h1 .stability {
-    text-transform: lowercase;
-    font-weight: 400;
-    margin-left: 14px;
-    padding: 4px 10px;
+em.stab p {
+    display: inline;
 }
 
-.impl-items .stability, .methods .stability {
-    margin-right: 20px;
+.module-item .stab {
+    border-width: 0;
+    padding: 0;
+    margin: 0;
+    background: inherit !important;
 }
 
-.stability.Deprecated { border-color: #A071A8; color: #82478C; }
-.stability.Experimental { border-color: #D46D6A; color: #AA3C39; }
-.stability.Unstable { border-color: #D4B16A; color: #AA8439; }
-.stability.Stable { border-color: #54A759; color: #2D8632; }
-.stability.Frozen { border-color: #009431; color: #007726; }
-.stability.Locked { border-color: #0084B6; color: #00668c; }
-.stability.Unmarked { border-color: #BBBBBB; }
+.module-item.unstable {
+    opacity: 0.65;
+}
 
 td.summary-column {
     width: 100%;
@@ -500,11 +510,6 @@ td.summary-column {
 .summary {
     padding-right: 0px;
 }
-.summary.Deprecated { background-color: #A071A8; }
-.summary.Experimental { background-color: #D46D6A; }
-.summary.Unstable { background-color: #D4B16A; }
-.summary.Stable { background-color: #54A759; }
-.summary.Unmarked { background-color: #BBBBBB; }
 
 :target { background: #FDFFD3; }
 .line-numbers :target { background-color: transparent; }
@@ -555,9 +560,9 @@ pre.rust { position: relative; }
 .collapse-toggle {
     font-weight: 300;
     position: absolute;
-    left: 13px;
+    left: -23px;
     color: #999;
-    margin-top: 2px;
+    top: 0;
 }
 
 .toggle-wrapper > .collapse-toggle {