From 4d5f4ff5e9297dcad21612f9dd20ae4598b5b7e2 Mon Sep 17 00:00:00 2001 From: Adrien Tétar Date: Tue, 8 Jul 2014 19:51:06 +0200 Subject: webfonts: proper fix --- src/doc/rust.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/doc/rust.css') diff --git a/src/doc/rust.css b/src/doc/rust.css index 3dd770fd976..2d79b321b9a 100644 --- a/src/doc/rust.css +++ b/src/doc/rust.css @@ -23,22 +23,22 @@ 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'); } *:not(body) { @@ -52,7 +52,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; -- cgit 1.4.1-3-g733a5 From 3b0b7b6b914abe791481ba9f47cf42aac32f398b Mon Sep 17 00:00:00 2001 From: Adrien Tétar Date: Tue, 8 Jul 2014 20:26:23 +0200 Subject: webfonts: serve Source Code Pro locally So that we have freestanding docs. --- src/doc/favicon.inc | 2 -- src/doc/rust.css | 6 ++++++ src/librustdoc/html/layout.rs | 2 -- src/librustdoc/html/render.rs | 4 ++++ src/librustdoc/html/static/SourceCodePro-Regular.woff | Bin 0 -> 55472 bytes src/librustdoc/html/static/SourceCodePro-Semibold.woff | Bin 0 -> 55360 bytes src/librustdoc/html/static/main.css | 12 ++++++++++++ 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/librustdoc/html/static/SourceCodePro-Regular.woff create mode 100644 src/librustdoc/html/static/SourceCodePro-Semibold.woff (limited to 'src/doc/rust.css') diff --git a/src/doc/favicon.inc b/src/doc/favicon.inc index 5de7957cdab..51609a660d3 100644 --- a/src/doc/favicon.inc +++ b/src/doc/favicon.inc @@ -1,3 +1 @@ - diff --git a/src/doc/rust.css b/src/doc/rust.css index 2d79b321b9a..668acc9a389 100644 --- a/src/doc/rust.css +++ b/src/doc/rust.css @@ -40,6 +40,12 @@ font-weight: 700; 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) { -webkit-box-sizing: border-box; diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index aa298d07780..356b224e6d5 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -42,8 +42,6 @@ r##" {title} - {favicon} diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 3cd3a7935dd..891b15d164c 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -484,6 +484,10 @@ fn write_shared(cx: &Context, include_bin!("static/Heuristica-Italic.woff"))); try!(write(cx.dst.join("SourceSerifPro-Bold.woff"), include_bin!("static/SourceSerifPro-Bold.woff"))); + try!(write(cx.dst.join("SourceCodePro-Regular.woff"), + include_bin!("static/SourceCodePro-Regular.woff"))); + try!(write(cx.dst.join("SourceCodePro-Semibold.woff"), + include_bin!("static/SourceCodePro-Semibold.woff"))); fn collect(path: &Path, krate: &str, key: &str) -> io::IoResult> { diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff new file mode 100644 index 00000000000..5576670903a Binary files /dev/null and b/src/librustdoc/html/static/SourceCodePro-Regular.woff differ diff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff new file mode 100644 index 00000000000..ca972a11dc4 Binary files /dev/null and b/src/librustdoc/html/static/SourceCodePro-Semibold.woff differ diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css index 711a60f713f..f65198fcfe2 100644 --- a/src/librustdoc/html/static/main.css +++ b/src/librustdoc/html/static/main.css @@ -39,6 +39,18 @@ font-weight: 700; 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'); +} +@font-face { + font-family: 'Source Code Pro'; + font-style: normal; + font-weight: 600; + src: local('Source Code Pro Semibold'), url("SourceCodePro-Semibold.woff") format('woff'); +} @import "normalize.css"; -- cgit 1.4.1-3-g733a5