diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 8603361362cc77bbc3a60528f74e477e7967ab0d..7ec3c2d738a6713c031ea2c51f8c1b7dd3f44995 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -374,9 +374,15 @@ fn run(self, builder: &Builder<'_>) { } if filename == "not_found.md" { - cmd.arg("--markdown-css").arg("https://doc.rust-lang.org/rust.css"); + cmd.arg("--markdown-css") + .arg(format!("https://doc.rust-lang.org/rustdoc{}.css", &builder.version)) + .arg("--markdown-css") + .arg("https://doc.rust-lang.org/rust.css"); } else { - cmd.arg("--markdown-css").arg("rust.css"); + cmd.arg("--markdown-css") + .arg(format!("rustdoc{}.css", &builder.version)) + .arg("--markdown-css") + .arg("rust.css"); } builder.run(&mut cmd); } diff --git a/src/doc/rust.css b/src/doc/rust.css index dba97a067a32cf9db0224f9666dcdcfd1856895d..d33ab0326031f84febab82ab42c0800ccce76c68 100644 --- a/src/doc/rust.css +++ b/src/doc/rust.css @@ -1,91 +1,15 @@ -/* See FiraSans-LICENSE.txt for the Fira Sans license. */ -@font-face { - font-family: 'Fira Sans'; - font-style: normal; - font-weight: 400; - src: local('Fira Sans'), - url("FiraSans-Regular.woff2") format("woff2"), - url("FiraSans-Regular.woff") format('woff'); - font-display: swap; -} -@font-face { - font-family: 'Fira Sans'; - font-style: normal; - font-weight: 500; - src: local('Fira Sans Medium'), - url("FiraSans-Medium.woff2") format("woff2"), - url("FiraSans-Medium.woff") format('woff'); - font-display: swap; -} - -/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */ -@font-face { - font-family: 'Source Serif 4'; - font-style: normal; - font-weight: 400; - src: local('Source Serif 4'), url("SourceSerif4-Regular.ttf.woff") format('woff'); - font-display: swap; -} -@font-face { - font-family: 'Source Serif 4'; - font-style: italic; - font-weight: 400; - src: local('Source Serif 4 Italic'), url("SourceSerif4-It.ttf.woff") format('woff'); - font-display: swap; -} -@font-face { - font-family: 'Source Serif 4'; - font-style: normal; - font-weight: 700; - src: local('Source Serif 4 Bold'), url("SourceSerif4-Bold.ttf.woff") format('woff'); - font-display: swap; -} - -/* See SourceCodePro-LICENSE.txt for the Source Code Pro license. */ -@font-face { - font-family: 'Source Code Pro'; - font-style: normal; - 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-display: swap; -} -@font-face { - font-family: 'Source Code Pro'; - font-style: italic; - font-weight: 400; - src: url("SourceCodePro-It.ttf.woff") format('woff'); - font-display: swap; -} -@font-face { - font-family: 'Source Code Pro'; - font-style: normal; - font-weight: 600; - src: url("SourceCodePro-Semibold.ttf.woff") format('woff'); - font-display: swap; -} - -*:not(body) { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - /* General structure */ body { - background-color: white; margin: 0 auto; padding: 0 15px; - font-family: "Source Serif 4", Georgia, Times, "Times New Roman", serif; font-size: 18px; color: #333; line-height: 1.428571429; - -webkit-font-feature-settings: "kern", "liga"; - -moz-font-feature-settings: "kern", "liga"; - font-feature-settings: "kern", "liga"; + -webkit-box-sizing: unset; + -moz-box-sizing: unset; + box-sizing: unset; } @media (min-width: 768px) { body { @@ -93,11 +17,7 @@ body { } } -h1, h2, h3, h4, h5, h6, nav, #versioninfo { - font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; -} -h1, h2, h3, h4, h5, h6 { - color: black; +h2, h3, h4, h5, h6 { font-weight: 400; line-height: 1.1; } @@ -107,6 +27,7 @@ h1, h2, h3 { } h1 { margin-bottom: 20px; + line-height: 1.1; } h4, h5, h6 { margin-top: 12px; @@ -114,6 +35,7 @@ h4, h5, h6 { padding: 5px 10px; } h5, h6 { + color: black; text-decoration: underline; } @@ -138,6 +60,7 @@ h3 { } h4 { font-size: 22px; + border-bottom: none; } h5 { font-size: 20px; @@ -208,19 +131,15 @@ a:hover, a:active { h1 a:link, h1 a:visited, h2 a:link, h2 a:visited, h3 a:link, h3 a:visited, h4 a:link, h4 a:visited, h5 a:link, h5 a:visited {color: black;} -h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, -h5 a:hover {text-decoration: none;} /* Code */ pre, code { - font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace; word-wrap: break-word; } pre { border-left: 2px solid #eee; white-space: pre-wrap; - padding: 14px; padding-right: 0; margin: 20px 0; font-size: 15px; @@ -244,19 +163,6 @@ a > code { color: #8D1A38; } -/* Code highlighting */ -pre.rust .kw { color: #8959A8; } -pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; } -pre.rust .number, pre.rust .string { color: #718C00; } -pre.rust .self, pre.rust .bool-val, pre.rust .prelude-val, -pre.rust .attribute, pre.rust .attribute .ident { color: #C82829; } -pre.rust .comment { color: #8E908C; } -pre.rust .doccomment { color: #4D4D4C; } -pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; } -pre.rust .lifetime { color: #B76514; } - -/* The rest */ - #versioninfo { text-align: center; margin: 0.5em; @@ -298,9 +204,6 @@ blockquote p:last-child { margin-bottom: 0; } -ul, ol { - padding-left: 25px; -} ul ul, ol ul, ul ol, ol ol { margin-bottom: 0; } @@ -355,22 +258,8 @@ table th { /* Code snippets */ -.example-wrap { position: relative; } -pre.rust { position: relative; } a.test-arrow { - background-color: rgba(78, 139, 202, 0.2); - display: inline-block; - position: absolute; - color: #f5f5f5; - padding: 5px 10px 5px 10px; - border-radius: 5px; - font-size: 130%; - top: 5px; - right: 5px; -} -a.test-arrow:hover{ - background-color: #4e8bca; - text-decoration: none; + color: #f5f5f5 } .unstable-feature { @@ -439,19 +328,6 @@ a.test-arrow:hover{ position: relative; } -.information { - position: absolute; - left: -25px; - margin-top: 7px; - z-index: 1; -} - -.tooltip { - position: relative; - display: inline-block; - cursor: pointer; -} - .tooltip .tooltiptext { width: 120px; display: none; diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css index a2dfb89820b01450f753f2c107509ee13bfb1812..6785b79ffda9680d5e2c6c5be0091d51b5decd6c 100644 --- a/src/librustdoc/html/static/themes/light.css +++ b/src/librustdoc/html/static/themes/light.css @@ -159,9 +159,6 @@ a.result-keyword:focus { background-color: #f99650; } .content .fnname { color: #9a6e31; } .content span.keyword, .content a.keyword, .block a.current.keyword { color: #de5249; } -pre.rust .comment { color: #8E908C; } -pre.rust .doccomment { color: #4D4D4C; } - nav:not(.sidebar) { border-bottom-color: #e0e0e0; } @@ -252,6 +249,8 @@ pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; } pre.rust .number, pre.rust .string { color: #718C00; } pre.rust .self, pre.rust .bool-val, pre.rust .prelude-val, pre.rust .attribute, pre.rust .attribute .ident { color: #C82829; } +pre.rust .comment { color: #8E908C; } +pre.rust .doccomment { color: #4D4D4C; } pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; } pre.rust .lifetime { color: #B76514; } pre.rust .question-mark { diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs index ff6923b3797ebf052ad5d3614441504fcd3dcdf3..e3700136aca8aa186bc0e239228a0d95acaab39f 100644 --- a/src/tools/error_index_generator/main.rs +++ b/src/tools/error_index_generator/main.rs @@ -67,6 +67,7 @@ fn header(&self, output: &mut dyn Write) -> Result<(), Box> { Rust Compiler Error Index +