Skip to content

Commit 395d885

Browse files
borsbors
committed
auto merge of #13744 : adrientetar/rust/derp, r=brson
- Serve webfonts locally - Style changes around `blockquote` and `code` - Minor adjustments from previous changes Bringing back updated examples: [modified tutorial](http://adrientetar.legtux.org/cached/rust-docs/tutorial.htm) and [modified manual](http://adrientetar.legtux.org/cached/rust-docs/manual.htm). And for rustdoc, [modified `enum.FileType`](http://adrientetar.legtux.org/cached/rust-docs/enum.FileType.htm), [modified `std`](http://adrientetar.legtux.org/cached/rust-docs/std.htm) and [modified `std::io`](http://adrientetar.legtux.org/cached/rust-docs/io.htm).
2 parents 6c3bdbe + b3577a1 commit 395d885

11 files changed

Lines changed: 98 additions & 70 deletions

File tree

‎mk/docs.mk‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,26 @@ doc/footer.inc: $(D)/footer.inc | doc/
141141
@$(call E, cp: $@)
142142
$(Q)cp -a $< $@ 2> /dev/null
143143

144+
doc/FiraSans-Regular.woff: $(D)/FiraSans-Regular.woff | doc/
145+
@$(call E, cp: $@)
146+
$(Q)cp -a $< $@ 2> /dev/null
147+
148+
doc/FiraSans-Medium.woff: $(D)/FiraSans-Medium.woff | doc/
149+
@$(call E, cp: $@)
150+
$(Q)cp -a $< $@ 2> /dev/null
151+
152+
doc/Heuristica-Regular.woff: $(D)/Heuristica-Regular.woff | doc/
153+
@$(call E, cp: $@)
154+
$(Q)cp -a $< $@ 2> /dev/null
155+
156+
doc/Heuristica-Italic.woff: $(D)/Heuristica-Italic.woff | doc/
157+
@$(call E, cp: $@)
158+
$(Q)cp -a $< $@ 2> /dev/null
159+
160+
doc/Heuristica-Bold.woff: $(D)/Heuristica-Bold.woff | doc/
161+
@$(call E, cp: $@)
162+
$(Q)cp -a $< $@ 2> /dev/null
163+
144164
# The (english) documentation for each doc item.
145165

146166
define DEF_SHOULD_BUILD_PDF_DOC

‎src/doc/FiraSans-Medium.woff‎

87.8 KB
Binary file not shown.

‎src/doc/FiraSans-Regular.woff‎

89.8 KB
Binary file not shown.

‎src/doc/Heuristica-Bold.woff‎

120 KB
Binary file not shown.

‎src/doc/Heuristica-Italic.woff‎

117 KB
Binary file not shown.

‎src/doc/Heuristica-Regular.woff‎

157 KB
Binary file not shown.

‎src/doc/favicon.inc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico" />
1+
<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico">
2+
<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400'
3+
rel='stylesheet' type='text/css'>

‎src/doc/rust.css‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,41 @@
1414
font-family: 'Fira Sans';
1515
font-style: normal;
1616
font-weight: 400;
17-
src: local('Fira Sans'), url("http://www.rust-lang.org/fonts/FiraSans-Regular.woff") format('woff');
17+
src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
1818
}
1919
@font-face {
2020
font-family: 'Fira Sans';
2121
font-style: normal;
2222
font-weight: 500;
23-
src: local('Fira Sans Medium'), url("http://www.rust-lang.org/fonts/FiraSans-Medium.woff") format('woff');
23+
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
2424
}
2525
@font-face {
2626
font-family: 'Heuristica';
2727
font-style: normal;
2828
font-weight: 400;
29-
src: local('Heuristica Regular'), url("http://www.rust-lang.org/fonts/Heuristica-Regular.woff") format('woff');
29+
src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
3030
}
3131
@font-face {
3232
font-family: 'Heuristica';
3333
font-style: italic;
3434
font-weight: 400;
35-
src: local('Heuristica Italic'), url("http://www.rust-lang.org/fonts/Heuristica-Italic.woff") format('woff');
35+
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
3636
}
3737
@font-face {
3838
font-family: 'Heuristica';
3939
font-style: normal;
4040
font-weight: 700;
41-
src: local('Heuristica Bold'), url("http://www.rust-lang.org/fonts/Heuristica-Bold.woff") format('woff');
41+
src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
4242
}
43-
/* Global page semantics
44-
========================================================================== */
43+
44+
*:not(body) {
45+
-webkit-box-sizing: border-box;
46+
-moz-box-sizing: border-box;
47+
box-sizing: border-box;
48+
}
49+
50+
/* General structure */
51+
4552
body {
4653
margin: 0 auto;
4754
padding: 0 15px;
@@ -71,16 +78,6 @@ h1, h2, h3 {
7178
h1 {
7279
margin-bottom: 20px;
7380
}
74-
@media (min-width: 1170px) {
75-
h1 {
76-
margin-top: 40px;
77-
margin-bottom: 30px;
78-
}
79-
h1, h2, h3 {
80-
margin-top: 30px;
81-
margin-bottom: 15px;
82-
}
83-
}
8481
h4, h5, h6 {
8582
margin-top: 12px;
8683
margin-bottom: 10px;
@@ -157,8 +154,8 @@ footer {
157154
margin-bottom: 1em;
158155
}
159156

160-
/* Links layout
161-
========================================================================== */
157+
/* Links layout */
158+
162159
a {
163160
text-decoration: none;
164161
color: #428BCA;
@@ -183,18 +180,16 @@ h5 a:link, h5 a:visited {color: black;}
183180
h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover,
184181
h5 a:hover {text-decoration: none;}
185182

186-
/* Code
187-
========================================================================== */
183+
/* Code */
184+
188185
pre, code {
189-
font-family: Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
190-
border-radius: 4px;
186+
font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
191187
}
192188
pre {
193-
background-color: #FDFDFD;
194-
border: 1px solid #CCC;
195-
border-radius: 0.5em;
189+
border-left: 2px solid #eee;
196190
white-space: pre-wrap;
197-
padding: 9.5px;
191+
padding: 14px;
192+
padding-right: 0;
198193
margin: 20px 0;
199194
font-size: 13px;
200195
word-break: break-all;
@@ -203,15 +198,12 @@ pre {
203198
code {
204199
padding: 0 2px;
205200
color: #8D1A38;
206-
white-space: nowrap;
201+
white-space: pre-wrap;
207202
}
208203
pre code {
209204
padding: 0;
210205
font-size: inherit;
211206
color: inherit;
212-
white-space: pre-wrap;
213-
background-color: transparent;
214-
border-radius: 0;
215207
}
216208

217209
/* Code highlighting */
@@ -225,16 +217,16 @@ pre.rust .doccomment { color: #4D4D4C; }
225217
pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
226218
pre.rust .lifetime { color: #B76514; }
227219

220+
/* The rest */
228221

229-
/* The rest
230-
========================================================================== */
231222
#versioninfo {
232223
text-align: center;
233224
margin: 0.5em;
234225
font-size: 1.1em;
235226
}
236-
@media only screen and (min-width: 768px) {
227+
@media (min-width: 992px) {
237228
#versioninfo {
229+
font-size: 0.8em;
238230
position: fixed;
239231
bottom: 0px;
240232
right: 0px;
@@ -243,7 +235,7 @@ pre.rust .lifetime { color: #B76514; }
243235
background-color: #fff;
244236
margin: 2px;
245237
padding: 0 2px;
246-
border-radius: .3em;
238+
border-radius: .2em;
247239
}
248240
}
249241
#versioninfo a.hash {
@@ -252,10 +244,12 @@ pre.rust .lifetime { color: #B76514; }
252244
}
253245

254246
blockquote {
255-
color: black;
256-
border-left: 5px solid #eee;
257-
margin: 0 0 20px;
258-
padding: 10px 20px;
247+
color: #000;
248+
margin: 20px 0;
249+
padding: 15px 20px;
250+
background-color: #f2f7f9;
251+
border-top: .1em solid #e5eef2;
252+
border-bottom: .1em solid #e5eef2;
259253
}
260254
blockquote p {
261255
font-size: 17px;
@@ -319,6 +313,12 @@ table th {
319313
padding: 5px;
320314
}
321315

316+
@media (min-width: 1170px) {
317+
pre {
318+
font-size: 15px;
319+
}
320+
}
321+
322322
@media print {
323323
* {
324324
text-shadow: none !important;

‎src/librustdoc/html/layout.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ r##"<!DOCTYPE html>
3838
3939
<title>{title}</title>
4040
41-
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600'
41+
<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400,600'
4242
rel='stylesheet' type='text/css'>
4343
<link rel="stylesheet" type="text/css" href="{root_path}main.css">
4444
45-
{favicon, select, none{} other{<link rel="shortcut icon" href="#" />}}
45+
{favicon, select, none{} other{<link rel="shortcut icon" href="#">}}
4646
</head>
4747
<body>
4848
<!--[if lte IE 8]>

‎src/librustdoc/html/render.rs‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -924,19 +924,6 @@ impl<'a> Item<'a> {
924924

925925
impl<'a> fmt::Show for Item<'a> {
926926
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
927-
match attr::find_stability(self.item.attrs.iter()) {
928-
Some(ref stability) => {
929-
try!(write!(fmt.buf,
930-
"<a class='stability {lvl}' title='{reason}'>{lvl}</a>",
931-
lvl = stability.level.to_str(),
932-
reason = match stability.text {
933-
Some(ref s) => (*s).clone(),
934-
None => InternedString::new(""),
935-
}));
936-
}
937-
None => {}
938-
}
939-
940927
// Write the breadcrumb trail header for the top
941928
try!(write!(fmt.buf, "\n<h1 class='fqn'>"));
942929
match self.item.inner {
@@ -964,6 +951,21 @@ impl<'a> fmt::Show for Item<'a> {
964951
try!(write!(fmt.buf, "<a class='{}' href=''>{}</a>",
965952
shortty(self.item), self.item.name.get_ref().as_slice()));
966953

954+
// Write stability attributes
955+
match attr::find_stability(self.item.attrs.iter()) {
956+
Some(ref stability) => {
957+
try!(write!(fmt.buf,
958+
"<a class='stability {lvl}' title='{reason}'>{lvl}</a>",
959+
lvl = stability.level.to_str(),
960+
reason = match stability.text {
961+
Some(ref s) => (*s).clone(),
962+
None => InternedString::new(""),
963+
}));
964+
}
965+
None => {}
966+
}
967+
968+
// Write `src` tag
967969
if self.cx.include_sources {
968970
let mut path = Vec::new();
969971
clean_srcpath(self.item.source.filename.as_bytes(), |component| {

0 commit comments

Comments
 (0)