diff options
| author | bors <bors@rust-lang.org> | 2019-03-30 22:15:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-30 22:15:05 +0000 |
| commit | b0fcfa7d6135ecfdfebd325683890ae6dcf5eb18 (patch) | |
| tree | 4814d703c2e0a716fb0fe5ac615763826937d04b /src/doc | |
| parent | befeeb7c083c9e5edddc86563cc461185d897a13 (diff) | |
| parent | 7da27b261a7b69ba77aa60ef4430c4cd2b9aedf6 (diff) | |
| download | rust-b0fcfa7d6135ecfdfebd325683890ae6dcf5eb18.tar.gz rust-b0fcfa7d6135ecfdfebd325683890ae6dcf5eb18.zip | |
Auto merge of #59575 - Centril:rollup, r=Centril
Rollup of 3 pull requests Successful merges: - #59405 (doc: use correct body font URLs) - #59562 (Changed reference style in dbg macro docs.) - #59569 (Add book.toml with title to unstable-book doc) Failed merges: r? @ghost
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/rust.css | 6 | ||||
| -rw-r--r-- | src/doc/unstable-book/book.toml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/doc/rust.css b/src/doc/rust.css index 631f64a11db..a92d4ff54db 100644 --- a/src/doc/rust.css +++ b/src/doc/rust.css @@ -14,19 +14,19 @@ font-family: 'Source Serif Pro'; font-style: normal; font-weight: 400; - src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff'); + 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; - src: url("Heuristica-Italic.woff") format('woff'); + src: url("SourceSerifPro-It.ttf.woff") format('woff'); } @font-face { font-family: 'Source Serif Pro'; font-style: normal; font-weight: 700; - src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff'); + src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff'); } @font-face { font-family: 'Source Code Pro'; diff --git a/src/doc/unstable-book/book.toml b/src/doc/unstable-book/book.toml new file mode 100644 index 00000000000..5534340f0db --- /dev/null +++ b/src/doc/unstable-book/book.toml @@ -0,0 +1,2 @@ +[book] +title = "The Rust Unstable Book" |