Skip to content

rustdoc: tweak highlighting #12649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 2 commits into from
Mar 4, 2014
Merged

rustdoc: tweak highlighting #12649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd09e91
rustdoc: tweak highlighting
adrientetar Mar 2, 2014
0106a04
doc: use the newer favicon
adrientetar Mar 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/doc/rust.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/doc/rustdoc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")];
~~~
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")];

Expand Down
2 changes: 1 addition & 1 deletion src/libgreen/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")];

Expand Down
2 changes: 1 addition & 1 deletion src/libnative/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")];

Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\">

Expand Down
32 changes: 16 additions & 16 deletions src/librustdoc/html/static/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 changes: 1 addition & 1 deletion src/libstd/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")];

Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")];

Expand Down
2 changes: 1 addition & 1 deletion src/libterm/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")];

Expand Down