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>2020-05-27 11:18:53 +0000
committerbors <bors@rust-lang.org>2020-05-27 11:18:53 +0000
commitacfc5584018de3a9a431a17f0cc34e0bfaf4cdeb (patch)
treebc831a62648379cfb43fba304bff233e2e4200f5 /src/librustdoc/html/static/rustdoc.css
parent783139bd8fc3b94fac9a1bf81bba2c506e8221b6 (diff)
parente6353aac9d0365d6541bb7f33548fdeb988b6563 (diff)
Auto merge of #72639 - Dylan-DPC:rollup-76upj51, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #72348 (Fix confusing error message for comma typo in multiline statement)
 - #72533 (Resolve UB in Arc/Weak interaction (2))
 - #72548 (Add test for old compiler ICE when using `Borrow`)
 - #72606 (Small cell example update)
 - #72610 (Remove font-display settings)
 - #72626 (Add remark regarding DoubleEndedIterator)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustdoc/html/static/rustdoc.css')
-rw-r--r--src/librustdoc/html/static/rustdoc.css9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index b1e0ab9ca64..2cb3347135c 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -3,14 +3,12 @@
 	font-family: 'Fira Sans';
 	font-style: normal;
 	font-weight: 400;
-	font-display: optional;
 	src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
 }
 @font-face {
 	font-family: 'Fira Sans';
 	font-style: normal;
 	font-weight: 500;
-	font-display: optional;
 	src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
 }
 
@@ -19,23 +17,18 @@
 	font-family: 'Source Serif Pro';
 	font-style: normal;
 	font-weight: 400;
-	/* The difference for body text without this font is greater than other fonts,
-	 * so the 0~100ms block of fallback is preferred over optional, for legibility. */
-	font-display: fallback;
 	src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
 }
 @font-face {
 	font-family: 'Source Serif Pro';
 	font-style: italic;
 	font-weight: 400;
-	font-display: optional;
 	src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff');
 }
 @font-face {
 	font-family: 'Source Serif Pro';
 	font-style: normal;
 	font-weight: 700;
-	font-display: optional;
 	src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
 }
 
@@ -44,7 +37,6 @@
 	font-family: 'Source Code Pro';
 	font-style: normal;
 	font-weight: 400;
-	font-display: optional;
 	/* Avoid using locally installed font because bad versions are in circulation:
 	 * see https://github.com/rust-lang/rust/issues/24355 */
 	src: url("SourceCodePro-Regular.woff") format('woff');
@@ -53,7 +45,6 @@
 	font-family: 'Source Code Pro';
 	font-style: normal;
 	font-weight: 600;
-	font-display: optional;
 	src: url("SourceCodePro-Semibold.woff") format('woff');
 }