about summary refs log tree commit diff
path: root/src/librustdoc/html/static/rustdoc.css
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-21 14:30:02 +0000
committerbors <bors@rust-lang.org>2019-11-21 14:30:02 +0000
commit35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed (patch)
tree198a52d838a5a90eee1de769a634e6e19c077914 /src/librustdoc/html/static/rustdoc.css
parentf1b882b55805c342e46ee4ca3beeef1d1fa2044b (diff)
parent5ab2bccbcdd48c7055eb77e348486d0bda283a1f (diff)
downloadrust-35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed.tar.gz
rust-35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed.zip
Auto merge of #66607 - Centril:rollup-yb7cl73, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #65355 (Stabilize `!` in Rust 1.41.0)
 - #65730 (Suggest to add lifetime constraint at explicit ouput of functions)
 - #66468 (Cleanup Miri SIMD intrinsics)
 - #66515 (Reduce size of `hir::Expr` by boxing more of `hir::InlineAsm`)
 - #66602 (Revert "Update Source Code Pro and include italics")

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustdoc/html/static/rustdoc.css')
-rw-r--r--src/librustdoc/html/static/rustdoc.css10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index b2c48bf089b..ca798931953 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -39,19 +39,13 @@
 	font-weight: 400;
 	/* Avoid using locally installed font because bad versions are in circulation:
 	 * see https://github.com/rust-lang/rust/issues/24355 */
-	src: url("SourceCodePro-Regular.ttf.woff") format('woff');
-}
-@font-face {
-	font-family: 'Source Code Pro';
-	font-style: italic;
-	font-weight: 400;
-	src: url("SourceCodePro-It.ttf.woff") format('woff');
+	src: url("SourceCodePro-Regular.woff") format('woff');
 }
 @font-face {
 	font-family: 'Source Code Pro';
 	font-style: normal;
 	font-weight: 600;
-	src: url("SourceCodePro-Semibold.ttf.woff") format('woff');
+	src: url("SourceCodePro-Semibold.woff") format('woff');
 }
 
 * {