about summary refs log tree commit diff
path: root/src/librustdoc/html
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-11 12:36:58 -0700
committerbors <bors@rust-lang.org>2014-03-11 12:36:58 -0700
commit74bfa7108a62c053fdeae2bb093f8035e19e2ef2 (patch)
tree4b447bfb82b4b87415087f7b71a5dd5c2b9e4ef0 /src/librustdoc/html
parent3bede9fd310540a0fd72371008f8aa606b23b11b (diff)
parent840a2701accbaeb6d4537db79e47150313c74d42 (diff)
auto merge of #12783 : adrientetar/rust/more-docs, r=alexcrichton
- remove `node.js` dep., it has no effect as of #12747 (1)
- switch between LaTeX compilers, some cleanups
- CSS: fixup the print stylesheet, refactor highlighting code (2)

(1): `prep.js` outputs its own HTML directives, which `pandoc` cannot recognize when converting the document into LaTeX (this is why the PDF docs have never been highlighted as of now).

Note that if we were to add the `.rust` class to snippets, we could probably use pandoc's native highlighting capatibilities i.e. Kate ([here is](http://adrientetar.github.io/rust-tuts/tutorial/tutorial.pdf) an example of that).

(2): the only real highlighting change is for lifetimes which are now brown instead of red, the rest is just refactor of twos shades of red that look the same.
Also I made numbers highlighting for src in rustdoc a tint more clear so that it is less bothering.

@alexcrichton, @huonw

Closes #9873. Closes #12788.
Diffstat (limited to 'src/librustdoc/html')
-rw-r--r--src/librustdoc/html/static/main.css17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 0efee51a219..f2c10f053c2 100644
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -126,7 +126,7 @@ nav.sub {
 .content pre.line-numbers { float: left; border: none; }
 .line-numbers span { color: #c67e2d; }
 .line-numbers .line-highlighted {
-    background-color: #fff871;
+    background-color: #f6fdb0;
 }
 
 .content .highlighted {
@@ -306,19 +306,16 @@ a {
 
 pre.rust, pre.line-numbers { background-color: #FDFDFD; }
 
-/* Code Highlighting */
+/* Code highlighting */
 pre.rust .kw { color: #8959A8; }
 pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; }
-pre.rust .number { color: #718C00; }
-pre.rust .self { color: #C13928; }
-pre.rust .boolval { color: #C13928; }
-pre.rust .prelude-val { color: #C13928; }
+pre.rust .number, pre.rust .string { color: #718C00; }
+pre.rust .self, pre.rust .boolval, pre.rust .prelude-val,
+pre.rust .attribute, pre.rust .attribute .ident { color: #C82829; }
 pre.rust .comment { color: #8E908C; }
 pre.rust .doccomment { color: #4D4D4C; }
-pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999f; }
-pre.rust .string { color: #718C00; }
-pre.rust .lifetime { color: #C13928; }
-pre.rust .attribute, pre.rust .attribute .ident { color: #C82829; }
+pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
+pre.rust .lifetime { color: #B76514; }
 
 h1:hover a:after,
 h2:hover a:after,