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

auto merge of #15530 : adrientetar/rust/proper-fonts, r=alexcrichton

Browse source 
- Treat WOFF as binary files so that git does not perform newline normalization.
- Replace corrupt Heuristica files with Source Serif Pro — italics are [almost in production](https://github.com/adobe/source-serif-pro/issues/2) so I left Heuristica Italic which makes a good pair with SSP. Overall, Source Serif Pro is I think a better fit for rustdoc (cc @TheHydroImpulse). This ought to fix #15527.
- Store Source Code Pro locally in order to make offline docs freestanding. Fixes #14778.

Preview: http://adrientetar.legtux.org/cached/rust-docs/core.html

r? @alexcrichton
This commit is contained in:
bors 2014-07-09 10:36:31 +00:00
commit b53f3e7ddb
16 changed files with 427 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/doc/favicon.inc
View file

@ -1,3 +1 @@
<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico">
<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400'
rel='stylesheet' type='text/css'>

20
src/doc/rust.css
View file

@ -23,22 +23,28 @@
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
}
@font-face {
font-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: normal;
font-weight: 400;
src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
}
@font-face {
font-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: italic;
font-weight: 400;
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
src: url("Heuristica-Italic.woff") format('woff');
}
@font-face {
font-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: normal;
font-weight: 700;
src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
}
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 400;
src: local('Source Code Pro'), url("SourceCodePro-Regular.woff") format('woff');
}
*:not(body) {
@ -52,7 +58,7 @@
body {
margin: 0 auto;
padding: 0 15px;
font-family: "Heuristica", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 18px;
color: #333;
line-height: 1.428571429;