From 270d09dca9aae263671c4d32bbc7cb60dc378af8 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 29 Dec 2021 14:55:49 +0100 Subject: [PATCH 1/3] Fix font size for [src] links in headers --- src/librustdoc/html/static/css/rustdoc.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index d82c65398b835..450d5a3960232 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1080,8 +1080,11 @@ body.blur > :not(#help) { .impl-items .srclink, .impl .srclink, .methods .srclink { /* Override header settings otherwise it's too bold */ - font-size: 1.0625rem; font-weight: normal; + font-size: 1rem; +} +.impl .srclink { + font-size: 1.0625rem; } .rightside { From a0085f249ac1243c9cbc54e48fae8ffac07423b2 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 29 Dec 2021 14:56:07 +0100 Subject: [PATCH 2/3] Add test for [src] font-size in headers --- src/test/rustdoc-gui/src-font-size.goml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/test/rustdoc-gui/src-font-size.goml diff --git a/src/test/rustdoc-gui/src-font-size.goml b/src/test/rustdoc-gui/src-font-size.goml new file mode 100644 index 0000000000000..b0b2f122afdb9 --- /dev/null +++ b/src/test/rustdoc-gui/src-font-size.goml @@ -0,0 +1,12 @@ +// This test ensures that the "[src]" have the same font size as their headers +// to avoid having some weird height difference in the background when the element +// is selected. +goto: file://|DOC_PATH|/test_docs/struct.Foo.html +show-text: true +// Check the impl headers. +assert-css: (".impl.has-srclink .srclink", {"font-size": "17px"}, ALL) +// The ".6" part is because the font-size is actually "1.1em". +assert-css: (".impl.has-srclink .code-header.in-band", {"font-size": "17.6px"}, ALL) +// Check the impl items. +assert-css: (".impl-items .has-srclink .srclink", {"font-size": "16px"}, ALL) +assert-css: (".impl-items .has-srclink .code-header", {"font-size": "16px"}, ALL) From 3b70c6e4bda7588e51ed85bf9d13a953e0b0023f Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 5 Jan 2022 21:28:19 +0100 Subject: [PATCH 3/3] Simplify :target CSS selector --- src/librustdoc/html/static/css/themes/ayu.css | 5 +---- src/librustdoc/html/static/css/themes/dark.css | 5 +---- src/librustdoc/html/static/css/themes/light.css | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index 38040eeca52d4..6ed7845e83a35 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -351,11 +351,8 @@ a.test-arrow:hover { color: #999; } -:target, :target > * { - background: rgba(255, 236, 164, 0.06); -} - :target { + background: rgba(255, 236, 164, 0.06); border-right: 3px solid rgba(255, 180, 76, 0.85); } diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index f4181e431c896..64b6eb6696b83 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -295,11 +295,8 @@ a.test-arrow:hover{ color: #999; } -:target, :target > * { - background-color: #494a3d; -} - :target { + background-color: #494a3d; border-right: 3px solid #bb7410; } diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index 176f63098a49f..dbacc9f30735b 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -284,11 +284,8 @@ a.test-arrow:hover{ color: #999; } -:target, :target > * { - background: #FDFFD3; -} - :target { + background: #FDFFD3; border-right: 3px solid #AD7C37; }