diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-30 16:10:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 16:10:29 +0200 |
| commit | 32dac8c61d2e91b3bc723b417ae06efe0ac33f69 (patch) | |
| tree | 85c60bd35709e502be998ffdfbfff1d6fc1462d5 /src/librustdoc/html/static | |
| parent | 8a17bbfb28a976bdc6efd7a8dd0278197dec421f (diff) | |
| parent | 7aab005341cbac2c0a1d41ef103321fc06e76feb (diff) | |
| download | rust-32dac8c61d2e91b3bc723b417ae06efe0ac33f69.tar.gz rust-32dac8c61d2e91b3bc723b417ae06efe0ac33f69.zip | |
Rollup merge of #60382 - Manishearth:revert-code-font, r=GuillaumeGomez
Revert "Update Source Code Pro fonts to version 2.030" Temporary fix for https://github.com/rust-lang/rust/issues/60365 https://github.com/rust-lang/rust/pull/60146 updated all fonts (not just the fonts that were buggy), however it looks like the new Source Code Pro is buggy. We should test this out of tree: `cargo doc` on anything, replace the font in `target/doc`, and use `python -m SimpleHTTPServer` to see what's going on. Till we figure that out, I'll just back this out. r? @GuillaumeGomez This reverts commit 6bafc58cedc6f409dbcd8919a25b2f5d425f42ae.
Diffstat (limited to 'src/librustdoc/html/static')
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-LICENSE.txt (renamed from src/librustdoc/html/static/SourceCodePro-LICENSE.md) | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Regular.woff | bin | 95872 -> 55472 bytes | |||
| -rw-r--r-- | src/librustdoc/html/static/SourceCodePro-Semibold.woff | bin | 95576 -> 55360 bytes |
3 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/html/static/SourceCodePro-LICENSE.md b/src/librustdoc/html/static/SourceCodePro-LICENSE.txt index 1177330426d..07542572e33 100644 --- a/src/librustdoc/html/static/SourceCodePro-LICENSE.md +++ b/src/librustdoc/html/static/SourceCodePro-LICENSE.txt @@ -18,7 +18,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The diff --git a/src/librustdoc/html/static/SourceCodePro-Regular.woff b/src/librustdoc/html/static/SourceCodePro-Regular.woff index 117c7e5142c..5576670903a 100644 --- a/src/librustdoc/html/static/SourceCodePro-Regular.woff +++ b/src/librustdoc/html/static/SourceCodePro-Regular.woff Binary files differdiff --git a/src/librustdoc/html/static/SourceCodePro-Semibold.woff b/src/librustdoc/html/static/SourceCodePro-Semibold.woff index 270873a86a0..ca972a11dc4 100644 --- a/src/librustdoc/html/static/SourceCodePro-Semibold.woff +++ b/src/librustdoc/html/static/SourceCodePro-Semibold.woff Binary files differ |