about summary refs log tree commit diff
path: root/src/doc/rust.css
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-09 10:36:31 +0000
committerbors <bors@rust-lang.org>2014-07-09 10:36:31 +0000
commitb53f3e7ddb07fce91aafa6f2bb2db896cbc23992 (patch)
tree69b73b2eb2c747e68a172122fc470d1c309f8af1 /src/doc/rust.css
parentad3eda123a00b3ddf8897295ff26d97ba7c64d44 (diff)
parentb7ef0cf742c7c68afdb708fe9989f37760f3f542 (diff)
downloadrust-b53f3e7ddb07fce91aafa6f2bb2db896cbc23992.tar.gz
rust-b53f3e7ddb07fce91aafa6f2bb2db896cbc23992.zip
auto merge of #15530 : adrientetar/rust/proper-fonts, r=alexcrichton
- Treat WOFF as binary files so that git does not perform newline normalization.
- Replace corrupt Heuristica files with Source Serif Pro &mdash; 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
Diffstat (limited to 'src/doc/rust.css')
-rw-r--r--src/doc/rust.css20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/doc/rust.css b/src/doc/rust.css
index 3dd770fd976..668acc9a389 100644
--- a/src/doc/rust.css
+++ b/src/doc/rust.css
@@ -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;