From bee82e88374d5d11746dd456f22ac87a6e492afa Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Sun, 4 Dec 2016 13:44:19 -0800 Subject: Avoid using locally installed Source Code Pro font (fixes #24355). In some versions of this font the ampersands are drawn badly. --- src/librustdoc/html/static/rustdoc.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/librustdoc/html/static/rustdoc.css') diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 7ee184c089c..15912b41d59 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -52,13 +52,15 @@ font-family: 'Source Code Pro'; font-style: normal; font-weight: 400; - src: local('Source Code Pro'), url("SourceCodePro-Regular.woff") format('woff'); + /* 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'); } @font-face { font-family: 'Source Code Pro'; font-style: normal; font-weight: 600; - src: local('Source Code Pro Semibold'), url("SourceCodePro-Semibold.woff") format('woff'); + src: url("SourceCodePro-Semibold.woff") format('woff'); } * { -- cgit 1.4.1-3-g733a5 From e395fd12ddbad32d48db1e40cf57d25b035712a9 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Mon, 12 Dec 2016 17:41:39 +0000 Subject: rustdoc: Fix invalid HTML in stability notices `em` tags cannot contain `p` tags so just use a `div` instead. --- src/librustdoc/html/render.rs | 15 ++++++++++----- src/librustdoc/html/static/rustdoc.css | 8 ++++---- src/librustdoc/html/static/styles/main.css | 8 ++------ 3 files changed, 16 insertions(+), 15 deletions(-) (limited to 'src/librustdoc/html/static/rustdoc.css') diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index e721b66779f..6120eb8b78e 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1655,8 +1655,13 @@ fn document_full(w: &mut fmt::Formatter, item: &clean::Item) -> fmt::Result { } fn document_stability(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Result { - for stability in short_stability(item, cx, true) { - write!(w, "
{}
", stability)?; + let stabilities = short_stability(item, cx, true); + if !stabilities.is_empty() { + write!(w, "
")?; + for stability in stabilities { + write!(w, "{}", stability)?; + } + write!(w, "
")?; } Ok(()) } @@ -1855,7 +1860,7 @@ fn short_stability(item: &clean::Item, cx: &Context, show_reason: bool) -> Vec{}", text)) + stability.push(format!("
{}
", text)) }; if stab.level == stability::Unstable { @@ -1880,7 +1885,7 @@ fn short_stability(item: &clean::Item, cx: &Context, show_reason: bool) -> Vec{}", text)) + stability.push(format!("
{}
", text)) }; } else if let Some(depr) = item.deprecation.as_ref() { let note = if show_reason && !depr.note.is_empty() { @@ -1895,7 +1900,7 @@ fn short_stability(item: &clean::Item, cx: &Context, show_reason: bool) -> Vec{}", text)) + stability.push(format!("
{}
", text)) } stability diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 7ee184c089c..a1370cfc95b 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -523,20 +523,20 @@ body.blur > :not(#help) { padding: 20px; } -em.stab { - display: inline-block; +.stab { + display: table; border-width: 1px; border-style: solid; padding: 3px; margin-bottom: 5px; font-size: 90%; - font-style: normal; } -em.stab p { +.stab p { display: inline; } .module-item .stab { + display: inline; border-width: 0; padding: 0; margin: 0; diff --git a/src/librustdoc/html/static/styles/main.css b/src/librustdoc/html/static/styles/main.css index 6a9a24f6996..862d6d12b9a 100644 --- a/src/librustdoc/html/static/styles/main.css +++ b/src/librustdoc/html/static/styles/main.css @@ -30,10 +30,6 @@ h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.t background-color: white; } -div.stability > em > code { - background-color: initial; -} - .docblock code, .docblock-short code { background-color: #F5F5F5; } @@ -129,5 +125,5 @@ a.test-arrow { background-color: white; } -em.stab.unstable { background: #FFF5D6; border-color: #FFC600; } -em.stab.deprecated { background: #F3DFFF; border-color: #7F0087; } +.stab.unstable { background: #FFF5D6; border-color: #FFC600; } +.stab.deprecated { background: #F3DFFF; border-color: #7F0087; } -- cgit 1.4.1-3-g733a5 From 17dd0e5cd9debdaeec264f2574eaa609bce07b0c Mon Sep 17 00:00:00 2001 From: Clar Charr Date: Mon, 19 Dec 2016 18:00:29 -0500 Subject: Don't @import normalize.css. --- src/librustdoc/html/layout.rs | 1 + src/librustdoc/html/static/rustdoc.css | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/librustdoc/html/static/rustdoc.css') diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index 5353642e294..06a81641296 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -46,6 +46,7 @@ r##" {title} + {css_extension} diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 15912b41d59..ce7c6acdf47 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -1,5 +1,3 @@ -@import "normalize.css"; - /** * Copyright 2013 The Rust Project Developers. See the COPYRIGHT * file at the top-level directory of this distribution and at -- cgit 1.4.1-3-g733a5