Skip to content

Commit a15448c

Browse files
borsbors
committed
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
2 parents 19fadf6 + 0106a04 commit a15448c

File tree

11 files changed

+37
-37
lines changed

11 files changed

+37
-37
lines changed

‎src/doc/rust.css

+12-12
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ h5 a:link, h5 a:visited {color: black;}
111111
/* Code
112112
========================================================================== */
113113
pre, code {
114-
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
114+
font-family: Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
115115
border-radius: 4px;
116116
}
117117
pre {
118-
background-color: #F5F5F5;
118+
background-color: #FDFDFD;
119119
border: 1px solid #CCC;
120120
border-radius: 0.5em;
121121
white-space: pre-wrap;
@@ -142,24 +142,24 @@ pre code {
142142
}
143143

144144
/* Code highlighting */
145-
.cm-s-default span.cm-keyword {color: #803C8D;}
145+
.cm-s-default span.cm-keyword {color: #8959A8;}
146146
.cm-s-default span.cm-atom {color: #219;}
147-
.cm-s-default span.cm-number {color: #2AA198;}
148-
.cm-s-default span.cm-def {color: #256EB8;}
149-
.cm-s-default span.cm-variable {color: black;}
150-
.cm-s-default span.cm-variable-2 {color: #817E61;}
151-
.cm-s-default span.cm-variable-3 {color: #085;}
147+
.cm-s-default span.cm-number {color: #3E999F;}
148+
.cm-s-default span.cm-def {color: #4271AE;}
149+
/*.cm-s-default span.cm-variable {color: #C82829;}*/
150+
.cm-s-default span.cm-variable-2 {color: #6F906C;}
151+
.cm-s-default span.cm-variable-3 {color: #B76514;}
152152
.cm-s-default span.cm-property {color: black;}
153153
.cm-s-default span.cm-operator {color: black;}
154-
.cm-s-default span.cm-comment {color: #A82323;}
155-
.cm-s-default span.cm-string {color: #866544;}
156-
.cm-s-default span.cm-string-2 {color: #F50;}
154+
.cm-s-default span.cm-comment {color: #8E908C;}
155+
.cm-s-default span.cm-string {color: #718C00;}
156+
.cm-s-default span.cm-string-2 {color: #866544;}
157157
.cm-s-default span.cm-meta {color: #555;}
158158
/*.cm-s-default span.cm-error {color: #F00;}*/
159159
.cm-s-default span.cm-qualifier {color: #555;}
160160
.cm-s-default span.cm-builtin {color: #30A;}
161161
.cm-s-default span.cm-bracket {color: #CC7;}
162-
.cm-s-default span.cm-tag {color: #170;}
162+
.cm-s-default span.cm-tag {color: #C82829;}
163163
.cm-s-default span.cm-attribute {color: #00C;}
164164

165165
/* The rest

‎src/doc/rustdoc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ is how the above advertisement works. An example from the `libstd`
6363
documentation:
6464

6565
~~~
66-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
66+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
6767
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
6868
html_root_url = "http://static.rust-lang.org/doc/master")];
6969
~~~

‎src/libextra/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Rust extras are part of the standard Rust distribution.
2525
#[license = "MIT/ASL2"];
2626
#[crate_type = "rlib"];
2727
#[crate_type = "dylib"];
28-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
28+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2929
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
3030
html_root_url = "http://static.rust-lang.org/doc/master")];
3131

‎src/libgreen/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
#[license = "MIT/ASL2"];
168168
#[crate_type = "rlib"];
169169
#[crate_type = "dylib"];
170-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
170+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
171171
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
172172
html_root_url = "http://static.rust-lang.org/doc/master")];
173173

‎src/libnative/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#[license = "MIT/ASL2"];
4646
#[crate_type = "rlib"];
4747
#[crate_type = "dylib"];
48-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
48+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
4949
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
5050
html_root_url = "http://static.rust-lang.org/doc/master")];
5151
#[deny(unused_result, unused_must_use)];

‎src/librustc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This API is completely unstable and subject to change.
2323
#[license = "MIT/ASL2"];
2424
#[crate_type = "dylib"];
2525
#[crate_type = "rlib"];
26-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
26+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2727
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2828
html_root_url = "http://static.rust-lang.org/doc/master")];
2929

‎src/librustdoc/html/layout.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub fn render<T: fmt::Show, S: fmt::Show>(
3535
<meta charset=\"utf-8\" />
3636
<title>{title}</title>
3737
38-
<link href='http://fonts.googleapis.com/css?family=Oswald:700|Inconsolata:400'
38+
<link href='http://fonts.googleapis.com/css?family=Oswald:700|Inconsolata:400,700'
3939
rel='stylesheet' type='text/css'>
4040
<link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}{krate}/main.css\">
4141

‎src/librustdoc/html/static/main.css

+16-16
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ h2 code, h3 code, h4 code {
4343
}
4444

4545
code, pre, h1.fqn {
46-
font-family: Menlo, Monaco, Consolas, "Inconsolata", "Courier New", monospace;
46+
font-family: "Inconsolata", Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
4747
}
4848
code, pre {
4949
color: #333;
@@ -304,18 +304,18 @@ a {
304304

305305
:target { background: #FDFFD3; }
306306

307-
pre.rust .kw { color: #cc782f; }
308-
pre.rust .kw-2 { color: #3bbb33; }
309-
pre.rust .prelude-ty { color: #3bbb33; }
310-
pre.rust .number { color: #c13928; }
311-
pre.rust .self { color: #c13928; }
312-
pre.rust .boolval { color: #c13928; }
313-
pre.rust .prelude-val { color: #c13928; }
314-
pre.rust .op { color: #cc782f; }
315-
pre.rust .comment { color: #533add; }
316-
pre.rust .doccomment { color: #d343d0; }
317-
pre.rust .macro { color: #d343d0; }
318-
pre.rust .macro-nonterminal { color: #d343d0; }
319-
pre.rust .string { color: #c13928; }
320-
pre.rust .lifetime { color: #d343d0; }
321-
pre.rust .attribute { color: #d343d0 !important; }
307+
pre.rust, pre.line-numbers { background-color: #FDFDFD; }
308+
309+
/* Code Highlighting */
310+
pre.rust .kw { color: #8959A8; }
311+
pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; }
312+
pre.rust .number { color: #718C00; }
313+
pre.rust .self { color: #C13928; }
314+
pre.rust .boolval { color: #C13928; }
315+
pre.rust .prelude-val { color: #C13928; }
316+
pre.rust .comment { color: #8E908C; }
317+
pre.rust .doccomment { color: #4D4D4C; }
318+
pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999f; }
319+
pre.rust .string { color: #718C00; }
320+
pre.rust .lifetime { color: #C13928; }
321+
pre.rust .attribute, pre.rust .attribute .ident { color: #C82829; }

‎src/libstd/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#[license = "MIT/ASL2"];
4949
#[crate_type = "rlib"];
5050
#[crate_type = "dylib"];
51-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
51+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
5252
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
5353
html_root_url = "http://static.rust-lang.org/doc/master")];
5454

‎src/libsyntax/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This API is completely unstable and subject to change.
2222
#[license = "MIT/ASL2"];
2323
#[crate_type = "dylib"];
2424
#[crate_type = "rlib"];
25-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
25+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2626
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2727
html_root_url = "http://static.rust-lang.org/doc/master")];
2828

‎src/libterm/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#[license = "MIT/ASL2"];
1616
#[crate_type = "rlib"];
1717
#[crate_type = "dylib"];
18-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
18+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
1919
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2020
html_root_url = "http://static.rust-lang.org/doc/master")];
2121

0 commit comments

Comments
 (0)