From 9c3ffd7681fca17e29ef90b8e91d6fe26b0a8b3f Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Sun, 23 Jan 2022 09:06:44 +0000 Subject: [PATCH 1/4] adjust sidebar link brightness --- src/librustdoc/html/static/css/themes/ayu.css | 3 +++ src/librustdoc/html/static/css/themes/dark.css | 3 +++ src/librustdoc/html/static/css/themes/light.css | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index 69097b81b9f1c..5e08d9732d484 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -221,6 +221,9 @@ pre.rust a, body.source .example-wrap pre.rust a { background: #333; } +.sidebar a { + color: #53b1db; +} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index 39165b2fc058f..057ba92136d1c 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -182,6 +182,9 @@ a.test-arrow { body.source .example-wrap pre.rust a { background: #333; } +.sidebar a { + color: #fdbf35; +} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index 448c9ac603c82..1b6188aaa3b6b 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -179,6 +179,9 @@ a.test-arrow { body.source .example-wrap pre.rust a { background: #eee; } +.sidebar a { + color: #356da4; +} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, From a0748d9436e1e0b674dfd98801058911489879c9 Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Sun, 23 Jan 2022 10:43:06 +0000 Subject: [PATCH 2/4] tweak all sidebar colours --- src/librustdoc/html/static/css/themes/ayu.css | 23 +++++++++++++++++ .../html/static/css/themes/dark.css | 25 ++++++++++++++++--- .../html/static/css/themes/light.css | 22 ++++++++++++++++ src/test/rustdoc-gui/anchors.goml | 2 +- 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index 5e08d9732d484..1aefe893f16a0 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -191,6 +191,10 @@ pre, .rustdoc.source .example-wrap { color: #a37acc; } +.sidebar a { color: #53b1db; } +.sidebar a.current.type { color: #53b1db; } +.sidebar a.current.associatedtype { color: #53b1db; } + pre.rust .comment { color: #788797; } pre.rust .doccomment { color: #a1ac88; } @@ -496,6 +500,25 @@ a.result-static:focus {} a.result-primitive:focus {} a.result-keyword:focus {} +.sidebar a.current.enum {} +.sidebar a.current.struct {} +.sidebar a.current.foreigntype {} +.sidebar a.current.attr, +.sidebar a.current.derive, +.sidebar a.current.macro {} +.sidebar a.current.union {} +.sidebar a.current.constant +.sidebar a.current.static {} +.sidebar a.current.primitive {} +.sidebar a.current.externcrate +.sidebar a.current.mod {} +.sidebar a.current.trait {} +.sidebar a.current.traitalias {} +.sidebar a.current.fn, +.sidebar a.current.method, +.sidebar a.current.tymethod {} +.sidebar a.current.keyword {} + @media (max-width: 700px) { .sidebar-menu { background-color: #14191f; diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index 057ba92136d1c..7b887f91c25d5 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -148,6 +148,28 @@ a.result-keyword:focus { background-color: #884719; } .content .fnname{ color: #2BAB63; } .content span.keyword, .content a.keyword, .block a.current.keyword { color: #D2991D; } +.sidebar a { color: #fdbf35; } +.sidebar a.current.enum { color: #12ece2; } +.sidebar a.current.struct { color: #12ece2; } +.sidebar a.current.type { color: #12ece2; } +.sidebar a.current.associatedtype { color: #fdbf35; } +.sidebar a.current.foreigntype { color: #12ece2; } +.sidebar a.current.attr, +.sidebar a.current.derive, +.sidebar a.current.macro { color: #0be900; } +.sidebar a.current.union { color: #12ece2; } +.sidebar a.current.constant +.sidebar a.current.static { color: #fdbf35; } +.sidebar a.current.primitive { color: #12ece2; } +.sidebar a.current.externcrate +.sidebar a.current.mod { color: #fdbf35; } +.sidebar a.current.trait { color: #cca7ff; } +.sidebar a.current.traitalias { color: #cca7ff; } +.sidebar a.current.fn, +.sidebar a.current.method, +.sidebar a.current.tymethod { color: #32d479; } +.sidebar a.current.keyword { color: #fdbf35; } + pre.rust .comment { color: #8d8d8b; } pre.rust .doccomment { color: #8ca375; } @@ -182,9 +204,6 @@ a.test-arrow { body.source .example-wrap pre.rust a { background: #333; } -.sidebar a { - color: #fdbf35; -} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index 1b6188aaa3b6b..cf0d586d954a0 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -148,6 +148,28 @@ a.result-keyword:focus { background-color: #afc6e4; } .content .fnname { color: #AD7C37; } .content span.keyword, .content a.keyword, .block a.current.keyword { color: #3873AD; } +.sidebar a { color: #356da4; } +.sidebar a.current.enum { color: #a63283; } +.sidebar a.current.struct { color: #a63283; } +.sidebar a.current.type { color: #a63283; } +.sidebar a.current.associatedtype { color: #356da4; } +.sidebar a.current.foreigntype { color: #356da4; } +.sidebar a.current.attr, +.sidebar a.current.derive, +.sidebar a.current.macro { color: #067901; } +.sidebar a.current.union { color: #a63283; } +.sidebar a.current.constant +.sidebar a.current.static { color: #356da4; } +.sidebar a.current.primitive { color: #a63283; } +.sidebar a.current.externcrate +.sidebar a.current.mod { color: #356da4; } +.sidebar a.current.trait { color: #6849c3; } +.sidebar a.current.traitalias { color: #4b349e; } +.sidebar a.current.fn, +.sidebar a.current.method, +.sidebar a.current.tymethod { color: #32d479; } +.sidebar a.current.keyword { color: #356da4; } + nav.main .current { border-top-color: #000; border-bottom-color: #000; diff --git a/src/test/rustdoc-gui/anchors.goml b/src/test/rustdoc-gui/anchors.goml index 2d48d21dc1b05..26e4503a5d086 100644 --- a/src/test/rustdoc-gui/anchors.goml +++ b/src/test/rustdoc-gui/anchors.goml @@ -20,7 +20,7 @@ assert-css: (".srclink", {"text-decoration": "underline solid rgb(56, 115, 173)" assert-css: ("#top-doc-prose-title", {"color": "rgb(0, 0, 0)"}) -assert-css: (".sidebar a", {"color": "rgb(56, 115, 173)"}) +assert-css: (".sidebar a", {"color": "rgb(53, 109, 164)"}) assert-css: (".in-band a", {"color": "rgb(0, 0, 0)"}) // We move the cursor over the "Implementations" title so the anchor is displayed. From f00b02bb69676d852d5267f859ed894bbfa6cc5c Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Sun, 23 Jan 2022 11:05:04 +0000 Subject: [PATCH 3/4] remove duplicate rule --- src/librustdoc/html/static/css/themes/ayu.css | 3 --- src/librustdoc/html/static/css/themes/light.css | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index 1aefe893f16a0..de75ca5acf7af 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -225,9 +225,6 @@ pre.rust a, body.source .example-wrap pre.rust a { background: #333; } -.sidebar a { - color: #53b1db; -} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index cf0d586d954a0..ec8cac7fa6ef7 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -201,9 +201,6 @@ a.test-arrow { body.source .example-wrap pre.rust a { background: #eee; } -.sidebar a { - color: #356da4; -} details.rustdoc-toggle > summary.hideme > span, details.rustdoc-toggle > summary::before, From ca3d0e2316f8d9f0e3b8b6a5285a94ec6e6c60ff Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Sun, 23 Jan 2022 19:26:07 +0000 Subject: [PATCH 4/4] update tests --- src/test/rustdoc-gui/sidebar.goml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/rustdoc-gui/sidebar.goml b/src/test/rustdoc-gui/sidebar.goml index c7abe896be1d1..ae198e4174293 100644 --- a/src/test/rustdoc-gui/sidebar.goml +++ b/src/test/rustdoc-gui/sidebar.goml @@ -9,7 +9,7 @@ assert-text: (".sidebar > .location", "Crate test_docs") // In modules, we only have one "location" element. assert-count: (".sidebar .location", 1) assert-text: ("#all-types", "All Items") -assert-css: ("#all-types", {"color": "rgb(56, 115, 173)"}) +assert-css: ("#all-types", {"color": "rgb(53, 109, 164)"}) // We check that we have the crates list and that the "current" on is "test_docs". assert-text: (".sidebar-elems .crate > ul > li > a.current", "test_docs") // And we're also supposed to have the list of items in the current module. @@ -38,7 +38,7 @@ assert-property: ("html", {"scrollTop": "0"}) // We now go back to the crate page to click on the "lib2" crate link. goto: file://|DOC_PATH|/test_docs/index.html -assert-css: (".sidebar-elems .crate > ul > li:first-child > a", {"color": "rgb(56, 115, 173)"}) +assert-css: (".sidebar-elems .crate > ul > li:first-child > a", {"color": "rgb(53, 109, 164)"}) click: ".sidebar-elems .crate > ul > li:first-child > a" // PAGE: lib2/index.html