user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Closes #12648.

@alexcrichton, @huonw
This commit is contained in:
bors 2014-03-04 12:01:45 -08:00
commit a15448c85a
11 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/doc/rust.css
View file

@ -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

2
src/doc/rustdoc.md
View file

@ -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")];
~~~

2
src/libextra/lib.rs
View file

@ -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")];

2
src/libgreen/lib.rs
View file

@ -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")];

2
src/libnative/lib.rs
View file

@ -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)];

2
src/librustc/lib.rs
View file

@ -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")];

2
src/librustdoc/html/layout.rs
View file

@ -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\">

32
src/librustdoc/html/static/main.css
View file

@ -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; }

2
src/libstd/lib.rs
View file

@ -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")];

2
src/libsyntax/lib.rs
View file

@ -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")];

2
src/libterm/lib.rs
View file

@ -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")];