Fix some CSS warnings and errors from VS Code #93444

camelid · 2022-01-28T21:48:57Z

There's no such CSS rule as box-shadow-color, so I instead copied the
whole box-shadow property to each rule to make it actually apply.

r? @jsha

rust-highfive · 2022-01-28T21:48:59Z

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez,@Folyd

GuillaumeGomez · 2022-01-28T22:21:11Z

src/librustdoc/html/static/css/themes/light.css

@@ -43,10 +43,6 @@ pre, .rustdoc.source .example-wrap {
 	scrollbar-color: rgba(36, 37, 39, 0.6) #d9d9d9;
 }

-.rust-logo {


In this case, it's to force other themes to have this rule.

What do you mean by "force"?

All the CSS rules in light.css must be present in the other themes, otherwise rustdoc will throw an error.

jsha · 2022-01-29T12:30:58Z

Looks good, once the diff to .rust-logo is reverted and the tests pass.

I confirmed box-shadow-color isn't a property. https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow

Color is supposed to be the fourth item in the box-shadow property. Other properties, like border are often decomposable into border-style, border-color, etc, but not this one. You can confirm the actual box shadow color (on the keyboard "icons" in the help popup) is default black.

camelid · 2022-01-29T20:34:27Z

Actually, maybe the right fix for the box-shadow is to copy the box-shadow rule to each theme so we get the right color?

GuillaumeGomez · 2022-01-29T20:37:39Z

That would be the right fix. But since it wasn't used, not sure if useful...

jsha · 2022-01-29T20:41:21Z

Also I was recently reading a design guide that said box shadows should not be used to indicate height in dark themes, which makes sense.

camelid · 2022-01-29T20:51:05Z

What do you think?

Light

Dark

Ayu

There's no such CSS rule as `box-shadow-color`, so I instead copied the whole `box-shadow` property to each rule to make it actually apply.

jsha · 2022-01-29T20:53:08Z

Looks pretty good! I guess here we are not using it to simulate a shadow, but instead to simulate a keycap, so it works in the dark themes.

camelid · 2022-01-29T20:56:34Z

src/librustdoc/html/static/css/themes/ayu.css

@@ -531,7 +531,7 @@ kbd {
 	background-color: #314559;
 	border-color: #5c6773;
 	border-bottom-color: #5c6773;
-	box-shadow-color: #c6cbd1;
+	box-shadow: inset 0 -1px 0 #5c6773;


Note that I intentionally changed it from #c6cbd1 to #5c6773 because the old color was the one used in the dark theme and seemed inconsistent with Ayu.

GuillaumeGomez · 2022-01-29T21:12:01Z

Looks good to me!

rust-log-analyzer · 2022-01-29T21:26:09Z

The job x86_64-gnu-llvm-12 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


running 165 tests
...................................i...............................i..........

command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/i686-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/mir-opt" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/mir-opt" "--stage-id" "stage2-i686-unknown-linux-gnu" "--suite" "mir-opt" "--mode" "mir-opt" "--target" "i686-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-12/bin/FileCheck" "--nodejs" "/usr/bin/node" "--linker" "cc" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "12.0.0" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes perfjitevents powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"
expected success, got: signal: 11 (core dumped)

Build completed unsuccessfully in 0:01:34

camelid · 2022-01-31T01:57:57Z

@bors r=GuillaumeGomez,jsha

bors · 2022-01-31T01:57:58Z

📌 Commit f8a013f has been approved by GuillaumeGomez,jsha

camelid · 2022-01-31T01:58:07Z

@bors rollup

camelid · 2022-01-31T01:59:21Z

src/librustdoc/html/static/css/themes/ayu.css

@@ -630,5 +630,5 @@ input:checked + .slider {
 	background: #616161;
 }
 .toggle-line:hover .toggle-line-inner {
-	background: ##898989;
+	background: #898989;


cc @willcrichton – this will change the display of scrape-examples

Ah yeah this is fixed in my PR.

…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#90277 (Improve terminology around "after typeck") - rust-lang#92918 (Allow eliding GATs in expression position) - rust-lang#93039 (Don't suggest inaccessible fields) - rust-lang#93155 (Switch pretty printer to block-based indentation) - rust-lang#93214 (Respect doc(hidden) when suggesting available fields) - rust-lang#93347 (Make `char::DecodeUtf16::size_hist` more precise) - rust-lang#93392 (Clarify documentation on char::MAX) - rust-lang#93444 (Fix some CSS warnings and errors from VS Code) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned jsha Jan 28, 2022

rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jan 28, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 28, 2022

camelid mentioned this pull request Jan 28, 2022

rustdoc: Merge method and tymethod URL fragments and sections #92658

Closed

GuillaumeGomez reviewed Jan 28, 2022

View reviewed changes

This comment has been minimized.

Sign in to view

camelid added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2022

camelid force-pushed the rustdoc-css-cleanup branch from 3c5506e to 519cad7 Compare January 29, 2022 20:31

camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 29, 2022

camelid force-pushed the rustdoc-css-cleanup branch from 519cad7 to f360f67 Compare January 29, 2022 20:49

Fix some CSS warnings and errors from VS Code

f8a013f

There's no such CSS rule as `box-shadow-color`, so I instead copied the whole `box-shadow` property to each rule to make it actually apply.

camelid force-pushed the rustdoc-css-cleanup branch from f360f67 to f8a013f Compare January 29, 2022 20:51

camelid commented Jan 29, 2022

View reviewed changes

GuillaumeGomez approved these changes Jan 29, 2022

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 31, 2022

camelid commented Jan 31, 2022

View reviewed changes

matthiaskrgr mentioned this pull request Jan 31, 2022

Rollup of 8 pull requests #93498

Merged

bors merged commit 2070b22 into rust-lang:master Jan 31, 2022

rustbot added this to the 1.60.0 milestone Jan 31, 2022

camelid deleted the rustdoc-css-cleanup branch January 31, 2022 20:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix some CSS warnings and errors from VS Code #93444

Fix some CSS warnings and errors from VS Code #93444

camelid commented Jan 28, 2022 •

edited

Loading

rust-highfive commented Jan 28, 2022

GuillaumeGomez Jan 28, 2022

camelid Jan 28, 2022

GuillaumeGomez Jan 28, 2022

This comment has been minimized.

jsha commented Jan 29, 2022

camelid commented Jan 29, 2022 •

edited

Loading

GuillaumeGomez commented Jan 29, 2022

jsha commented Jan 29, 2022 via email

camelid commented Jan 29, 2022

jsha commented Jan 29, 2022 via email

camelid Jan 29, 2022

GuillaumeGomez commented Jan 29, 2022

rust-log-analyzer commented Jan 29, 2022

camelid commented Jan 31, 2022

bors commented Jan 31, 2022

camelid commented Jan 31, 2022

camelid Jan 31, 2022

willcrichton Jan 31, 2022

Fix some CSS warnings and errors from VS Code #93444

Fix some CSS warnings and errors from VS Code #93444

Conversation

camelid commented Jan 28, 2022 • edited Loading

rust-highfive commented Jan 28, 2022

GuillaumeGomez Jan 28, 2022

Choose a reason for hiding this comment

camelid Jan 28, 2022

Choose a reason for hiding this comment

GuillaumeGomez Jan 28, 2022

Choose a reason for hiding this comment

This comment has been minimized.

jsha commented Jan 29, 2022

camelid commented Jan 29, 2022 • edited Loading

GuillaumeGomez commented Jan 29, 2022

jsha commented Jan 29, 2022 via email

camelid commented Jan 29, 2022

Light

Dark

Ayu

jsha commented Jan 29, 2022 via email

camelid Jan 29, 2022

Choose a reason for hiding this comment

GuillaumeGomez commented Jan 29, 2022

rust-log-analyzer commented Jan 29, 2022

camelid commented Jan 31, 2022

bors commented Jan 31, 2022

camelid commented Jan 31, 2022

camelid Jan 31, 2022

Choose a reason for hiding this comment

willcrichton Jan 31, 2022

Choose a reason for hiding this comment

camelid commented Jan 28, 2022 •

edited

Loading

camelid commented Jan 29, 2022 •

edited

Loading