auto merge of #12649 : adrientetar/rust/highlight, r=alexcrichton

[Here is](http://adrientetar.legtux.org/cached/rust-doc/to_str.rs.html) an example.

Closes #12648.

@alexcrichton, @huonw

11 files changed, 37 insertions, 37 deletions

diff --git a/src/doc/rust.css b/src/doc/rust.css
index 976c62beb03..17100274688 100644
--- a/src/doc/rust.css
+++ b/src/doc/rust.css
@@ -111,11 +111,11 @@ h5 a:link, h5 a:visited {color: black;}
 /* Code
    ========================================================================== */
 pre, code {
-    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+    font-family: Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
     border-radius: 4px;
 }
 pre {
-    background-color: #F5F5F5;
+    background-color: #FDFDFD;
     border: 1px solid #CCC;
     border-radius: 0.5em;
     white-space: pre-wrap;
@@ -142,24 +142,24 @@ pre code {
 }
 
 /* Code highlighting */
-.cm-s-default span.cm-keyword {color: #803C8D;}
+.cm-s-default span.cm-keyword {color: #8959A8;}
 .cm-s-default span.cm-atom {color: #219;}
-.cm-s-default span.cm-number {color: #2AA198;}
-.cm-s-default span.cm-def {color: #256EB8;}
-.cm-s-default span.cm-variable {color: black;}
-.cm-s-default span.cm-variable-2 {color: #817E61;}
-.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-number {color: #3E999F;}
+.cm-s-default span.cm-def {color: #4271AE;}
+/*.cm-s-default span.cm-variable {color: #C82829;}*/
+.cm-s-default span.cm-variable-2 {color: #6F906C;}
+.cm-s-default span.cm-variable-3 {color: #B76514;}
 .cm-s-default span.cm-property {color: black;}
 .cm-s-default span.cm-operator {color: black;}
-.cm-s-default span.cm-comment {color: #A82323;}
-.cm-s-default span.cm-string {color: #866544;}
-.cm-s-default span.cm-string-2 {color: #F50;}
+.cm-s-default span.cm-comment {color: #8E908C;}
+.cm-s-default span.cm-string {color: #718C00;}
+.cm-s-default span.cm-string-2 {color: #866544;}
 .cm-s-default span.cm-meta {color: #555;}
 /*.cm-s-default span.cm-error {color: #F00;}*/
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30A;}
 .cm-s-default span.cm-bracket {color: #CC7;}
-.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-tag {color: #C82829;}
 .cm-s-default span.cm-attribute {color: #00C;}
 
 /* The rest
diff --git a/src/doc/rustdoc.md b/src/doc/rustdoc.md
index 77aa9273734..3c04d867df9 100644
--- a/src/doc/rustdoc.md
+++ b/src/doc/rustdoc.md
@@ -63,7 +63,7 @@ is how the above advertisement works. An example from the `libstd`
 documentation:
 
 ~~~
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 ~~~
diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
index ba26e0c44fa..6861f527b1d 100644
--- a/src/libextra/lib.rs
+++ b/src/libextra/lib.rs
@@ -25,7 +25,7 @@ Rust extras are part of the standard Rust distribution.
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs
index dca1c869ad2..a054101d91d 100644
--- a/src/libgreen/lib.rs
+++ b/src/libgreen/lib.rs
@@ -167,7 +167,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
index 238e4c23b45..378283973db 100644
--- a/src/libnative/lib.rs
+++ b/src/libnative/lib.rs
@@ -45,7 +45,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[deny(unused_result, unused_must_use)];
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 4018e70b4f5..4a0d166429e 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -23,7 +23,7 @@ This API is completely unstable and subject to change.
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 #[crate_type = "rlib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index 708d3590517..c49df49dc11 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -35,7 +35,7 @@ pub fn render<T: fmt::Show, S: fmt::Show>(
     <meta charset=\"utf-8\" />
     <title>{title}</title>
 
-    <link href='http://fonts.googleapis.com/css?family=Oswald:700|Inconsolata:400'
+    <link href='http://fonts.googleapis.com/css?family=Oswald:700|Inconsolata:400,700'
           rel='stylesheet' type='text/css'>
     <link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}{krate}/main.css\">
 
diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 20c94d00711..84c7d33652c 100644
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -43,7 +43,7 @@ h2 code, h3 code, h4 code {
 }
 
 code, pre, h1.fqn {
-    font-family: Menlo, Monaco, Consolas, "Inconsolata", "Courier New", monospace;
+    font-family: "Inconsolata", Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
 }
 code, pre {
     color: #333;
@@ -304,18 +304,18 @@ a {
 
 :target { background: #FDFFD3; }
 
-pre.rust .kw { color: #cc782f; }
-pre.rust .kw-2 { color: #3bbb33; }
-pre.rust .prelude-ty { color: #3bbb33; }
-pre.rust .number { color: #c13928; }
-pre.rust .self { color: #c13928; }
-pre.rust .boolval { color: #c13928; }
-pre.rust .prelude-val { color: #c13928; }
-pre.rust .op { color: #cc782f; }
-pre.rust .comment { color: #533add; }
-pre.rust .doccomment { color: #d343d0; }
-pre.rust .macro { color: #d343d0; }
-pre.rust .macro-nonterminal { color: #d343d0; }
-pre.rust .string { color: #c13928; }
-pre.rust .lifetime { color: #d343d0; }
-pre.rust .attribute { color: #d343d0 !important; }
+pre.rust, pre.line-numbers { background-color: #FDFDFD; }
+
+/* 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 .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; }
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index d38daf68cbc..bdc4fc387ca 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -48,7 +48,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 42c9ab461aa..d66ace1fdfa 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -22,7 +22,7 @@ This API is completely unstable and subject to change.
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 #[crate_type = "rlib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
index db9f5d3da5c..903fede5faa 100644
--- a/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@ -15,7 +15,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];