diff options
| author | bors <bors@rust-lang.org> | 2019-11-21 14:30:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-21 14:30:02 +0000 |
| commit | 35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed (patch) | |
| tree | 198a52d838a5a90eee1de769a634e6e19c077914 /src/librustdoc/html/static | |
| parent | f1b882b55805c342e46ee4ca3beeef1d1fa2044b (diff) | |
| parent | 5ab2bccbcdd48c7055eb77e348486d0bda283a1f (diff) | |
| download | rust-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')
| -rw-r--r-- | src/librustdoc/html/static/COPYRIGHT.txt | 3 | ||||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-It.ttf.woff | bin | 84264 -> 0 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff | bin | 95872 -> 0 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Regular.woff | bin | 0 -> 55472 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff | bin | 95576 -> 0 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Semibold.woff | bin | 0 -> 55360 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static/rustdoc.css | 10 |
7 files changed, 3 insertions, 10 deletions
diff --git a/src/librustdoc/html/static/COPYRIGHT.txt b/src/librustdoc/html/static/COPYRIGHT.txt index 24bdca6544d..af77776cca4 100644 --- a/src/librustdoc/html/static/COPYRIGHT.txt +++ b/src/librustdoc/html/static/COPYRIGHT.txt @@ -23,8 +23,7 @@ included, and carry their own copyright notices and license terms: Copyright (c) Nicolas Gallagher and Jonathan Neal. Licensed under the MIT license (see LICENSE-MIT.txt). -* Source Code Pro (SourceCodePro-Regular.ttf.woff, - SourceCodePro-Semibold.ttf.woff, SourceCodePro-It.ttf.woff): +* Source Code Pro (SourceCodePro-Regular.woff, SourceCodePro-Semibold.woff): Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark diff --git a/src/librustdoc/html/static/SourceCodePro-It.ttf.woff b/src/librustdoc/html/static/SourceCodePro-It.ttf.woff deleted file mode 100644 index ebaaf91de06..00000000000 --- a/src/librustdoc/html/static/SourceCodePro-It.ttf.woff +++ /dev/null Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff b/src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff deleted file mode 100644 index 117c7e5142c..00000000000 --- a/src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff +++ /dev/null Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff new file mode 100644 index 00000000000..5576670903a --- /dev/null +++ b/src/librustdoc/html/static/SourceCodePro-Regular.woff Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff deleted file mode 100644 index 270873a86a0..00000000000 --- a/src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff +++ /dev/null Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff new file mode 100644 index 00000000000..ca972a11dc4 --- /dev/null +++ b/src/librustdoc/html/static/SourceCodePro-Semibold.woff Binary files differdiff --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'); } * { |
