diff --git a/src/doc/rust.css b/src/doc/rust.css index 9713ce5fcf6c8..9cf1f9ade8b74 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: 'Source Serif Pro'; + font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff'); + src: local('Source Sans Pro'), url("SourceSansPro-Regular.woff") format('woff'); } @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Sans Pro'; font-style: italic; font-weight: 400; src: url("Heuristica-Italic.woff") format('woff'); } @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Sans Pro'; font-style: normal; font-weight: 700; - src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff'); + src: local('Source Sans Pro Bold'), url("SourceSansPro-Bold.woff") format('woff'); } @font-face { font-family: 'Source Code Pro'; @@ -58,7 +58,7 @@ body { margin: 0 auto; padding: 0 15px; - font-family: "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; color: #333; line-height: 1.428571429; diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 9a2031dc447bd..de5dd2bd7d3e5 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -488,10 +488,10 @@ fn write_shared(cx: &Context, include_bin!("static/FiraSans-Medium.woff"))); try!(write(cx.dst.join("Heuristica-Italic.woff"), include_bin!("static/Heuristica-Italic.woff"))); - try!(write(cx.dst.join("SourceSerifPro-Regular.woff"), - include_bin!("static/SourceSerifPro-Regular.woff"))); - try!(write(cx.dst.join("SourceSerifPro-Bold.woff"), - include_bin!("static/SourceSerifPro-Bold.woff"))); + try!(write(cx.dst.join("SourceSansPro-Regular.woff"), + include_bin!("static/SourceSansPro-Regular.woff"))); + try!(write(cx.dst.join("SourceSansPro-Bold.woff"), + include_bin!("static/SourceSansPro-Bold.woff"))); try!(write(cx.dst.join("SourceCodePro-Regular.woff"), include_bin!("static/SourceCodePro-Regular.woff"))); try!(write(cx.dst.join("SourceCodePro-Semibold.woff"), diff --git a/src/librustdoc/html/static/SourceSansPro-Bold.woff b/src/librustdoc/html/static/SourceSansPro-Bold.woff new file mode 100644 index 0000000000000..997f32fa43021 Binary files /dev/null and b/src/librustdoc/html/static/SourceSansPro-Bold.woff differ diff --git a/src/librustdoc/html/static/SourceSansPro-It.woff b/src/librustdoc/html/static/SourceSansPro-It.woff new file mode 100644 index 0000000000000..8b412dfcdb95d Binary files /dev/null and b/src/librustdoc/html/static/SourceSansPro-It.woff differ diff --git a/src/librustdoc/html/static/SourceSerifPro-LICENSE.txt b/src/librustdoc/html/static/SourceSansPro-LICENSE.txt similarity index 94% rename from src/librustdoc/html/static/SourceSerifPro-LICENSE.txt rename to src/librustdoc/html/static/SourceSansPro-LICENSE.txt index 14b54813758d0..df187637e18d7 100644 --- a/src/librustdoc/html/static/SourceSerifPro-LICENSE.txt +++ b/src/librustdoc/html/static/SourceSansPro-LICENSE.txt @@ -1,4 +1,4 @@ -Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. +Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. This Font Software is licensed under the SIL Open Font License, Version 1.1. diff --git a/src/librustdoc/html/static/SourceSansPro-Regular.woff b/src/librustdoc/html/static/SourceSansPro-Regular.woff new file mode 100644 index 0000000000000..3e03cc0f9e65a Binary files /dev/null and b/src/librustdoc/html/static/SourceSansPro-Regular.woff differ diff --git a/src/librustdoc/html/static/SourceSerifPro-Bold.woff b/src/librustdoc/html/static/SourceSerifPro-Bold.woff deleted file mode 100644 index 435a6f975c97c..0000000000000 Binary files a/src/librustdoc/html/static/SourceSerifPro-Bold.woff and /dev/null differ diff --git a/src/librustdoc/html/static/SourceSerifPro-Regular.woff b/src/librustdoc/html/static/SourceSerifPro-Regular.woff deleted file mode 100644 index e8c43b852e10e..0000000000000 Binary files a/src/librustdoc/html/static/SourceSerifPro-Regular.woff and /dev/null differ diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css index 64a0665d4008b..fc7ae8c820a1a 100644 --- a/src/librustdoc/html/static/main.css +++ b/src/librustdoc/html/static/main.css @@ -22,22 +22,22 @@ src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff'); } @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff'); + src: local('Source Sans Pro'), url("SourceSansPro-Regular.woff") format('woff'); } @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Sans Pro'; font-style: italic; font-weight: 400; - src: url("Heuristica-Italic.woff") format('woff'); + src: local('Source Sans Pro'), url("SourceSansPro-It.woff") format('woff'); } @font-face { - font-family: 'Source Serif Pro'; + font-family: 'Source Sans Pro'; font-style: normal; font-weight: 700; - src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff'); + src: local('Source Sans Pro Bold'), url("SourceSansPro-Bold.woff") format('woff'); } @font-face { font-family: 'Source Code Pro'; @@ -65,7 +65,7 @@ body { color: #333; min-width: 500px; - font: 16px/1.4 "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; + font: 16px/1.4 "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 0; position: relative; padding: 10px 15px 20px 15px;