Skip to content

Improve wrapping on settings page#93420

Merged
bors merged 1 commit intorust-lang:masterfrom
jsha:adjust-settings-layout
Feb 2, 2022
Merged

Improve wrapping on settings page#93420
bors merged 1 commit intorust-lang:masterfrom
jsha:adjust-settings-layout

Conversation

@jsha
Copy link
Contributor

@jsha jsha commented Jan 28, 2022

Previously, the radio button choices for themes would wrap awkwardly on
narrow screens. With this change, the group of choices will prefer
bumping down to the next line together, leaving the setting name on its
own line.

Also fix some minor spacing issues:

  • Align the setting name vertically with the radio button choices.
  • Use margin instead of padding for most spacing choices.
  • Use no margin/padding on the right-hand side.

Demo: https://rustdoc.crud.net/jsha/adjust-settings-layout/settings.html

r? @GuillaumeGomez

Before (narrow screen):

image

After (narrow screen):

image

@jsha jsha added the A-rustdoc-ui Area: Rustdoc UI (generated HTML) label Jan 28, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented Jan 28, 2022

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez,@Folyd

@rustbot 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 rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 28, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 29, 2022

Looks good to me, thanks! Can you add a GUI test please? (to check that on small width, the label is not on the same y position as the radio buttons)

@jsha
Improve wrapping on settings page
c790128 
Previously, the radio button choices for themes would wrap awkwardly on
narrow screens. With this change, the group of choices will prefer
bumping down to the next line together, leaving the setting name on its
own line.

Also fix some minor spacing issues:

 - Align the setting name vertically with the radio button choices.
 - Use margin instead of padding for most spacing choices.
 - Use no margin/padding on the right-hand side.
@jsha jsha force-pushed the adjust-settings-layout branch from 0e0e2bf to c790128 Compare January 31, 2022 09:46
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Jan 31, 2022

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

Click to see the possible cause of the failure (guessed by this bot) 
  IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
 * branch              master     -> FETCH_HEAD
Searching for toolstate changes between bb549e5afe8f23258606649cc3a2d8b8a51ef63a and dac8433447813273f82cae56e63e4b3d4b634ea8
Rustdoc was updated
##[group]Run src/ci/scripts/verify-channel.sh
src/ci/scripts/verify-channel.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
---
-hello dup fd
-

The actual stdout differed from the expected stdout.
Actual stdout saved to /tmp/compiletestyJ0yfl/fs.stage-id.stdout

-hello dup fd
+error: unsupported operation: can't call foreign function: readdir64
+   --> /checkout/library/std/src/sys/unix/fs.rs:482:33
---
+
 

The actual stderr differed from the expected stderr.
Actual stderr saved to /tmp/compiletestyJ0yfl/fs.stage-id.stderr
To only update this specific test, also pass `--test-args fs.rs`

error: 2 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/fs.rs" "-L" "/tmp/compiletestyJ0yfl" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestyJ0yfl/fs.stage-id" "-A" "unused" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-Zmiri-disable-isolation" "-L" "/tmp/compiletestyJ0yfl/fs.stage-id.aux"
------------------------------------------

------------------------------------------
stderr:
---
.......... (50/59)
.........  (59/59)


/checkout/src/test/rustdoc-gui/item-summary-table.goml An exception occured: Failed to launch the browser process!
Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!


TROUBLESHOOTING: https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md
== STACKTRACE ==
Error
Error
    at innerRunTestCode (/node-v14.4.0-linux-x64/lib/node_modules/browser-ui-test/src/index.js:468:16)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)


command did not execute successfully: "/node-v14.4.0-linux-x64/bin/node" "/checkout/src/tools/rustdoc-gui/tester.js" "--jobs" "16" "--doc-folder" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-gui/doc" "--tests-folder" "/checkout/src/test/rustdoc-gui"


Build completed unsuccessfully in 0:00:20

@jsha
Copy link
Contributor Author

jsha commented Jan 31, 2022

Updated with a test. Not sure what this test failure is about:

/checkout/src/test/rustdoc-gui/item-summary-table.goml An exception occured: Failed to launch the browser process!
Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Feb 1, 2022

Thanks! And no idea why the test is failing. Seems like a puppeteer random issue...

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 1, 2022

📌 Commit c790128 has been approved by GuillaumeGomez

@bors 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 Feb 1, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 2, 2022
@matthiaskrgr
Rollup merge of rust-lang#93420 - jsha:adjust-settings-layout, r=Guil…
9e22ab1 
…laumeGomez

Improve wrapping on settings page

Previously, the radio button choices for themes would wrap awkwardly on
narrow screens. With this change, the group of choices will prefer
bumping down to the next line together, leaving the setting name on its
own line.

Also fix some minor spacing issues:

 - Align the setting name vertically with the radio button choices.
 - Use margin instead of padding for most spacing choices.
 - Use no margin/padding on the right-hand side.

 Demo: https://rustdoc.crud.net/jsha/adjust-settings-layout/settings.html

 r? `@GuillaumeGomez`

Before (narrow screen):

![image](https://user-images.githubusercontent.com/220205/151555533-7ab65216-d178-4dcc-8792-3c8fb9da8718.png)

After (narrow screen):

![image](https://user-images.githubusercontent.com/220205/151555702-ad79af32-f84b-4ee4-ae7a-1a2a463c0f6f.png)
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 2, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2022
@bors
Auto merge of rust-lang#93573 - matthiaskrgr:rollup-nrjmygz, r=matthi…
250384e 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#92758 (librustdoc: impl core::fmt::Write for rustdoc::html::render::Buffer)
 - rust-lang#92788 (Detect `::` -> `:` typo in type argument)
 - rust-lang#93420 (Improve wrapping on settings page)
 - rust-lang#93493 (Document valid values of the char type)
 - rust-lang#93531 (Fix incorrect panic message in example)
 - rust-lang#93559 (Add missing | between print options)
 - rust-lang#93560 (Fix two incorrect "it's" (typos in comments))

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2484cb8 into rust-lang:master Feb 2, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels

A-rustdoc-ui Area: Rustdoc UI (generated HTML) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.60.0

Development

Successfully merging this pull request may close these issues.

6 participants

@jsha @rust-highfive @rust-log-analyzer @GuillaumeGomez @bors @rustbot