Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure collapsed mergepane border #731

Merged
merged 15 commits into from
Nov 10, 2023
Merged

Conversation

vidartf
Copy link
Collaborator

@vidartf vidartf commented Nov 6, 2023

Followup to #728 After switching to grid based layout, each pane had its own border. With 0px gap, the border still did not collapse to single 1px border, so instead we switch to using gap + background-color.

C.f. https://stackoverflow.com/questions/47882924/preventing-double-borders-in-css-grid

Fixes #732.

After switching to grid based layout, each pane had its own border.
With 0px gap, the border still did not collapse to single 1px border,
so instead we switch to using gap + background-color.

C.f. https://stackoverflow.com/questions/47882924/preventing-double-borders-in-css-grid
@vidartf vidartf requested review from HaudinFlorence and krassowski and removed request for HaudinFlorence November 6, 2023 17:05
@vidartf
Copy link
Collaborator Author

vidartf commented Nov 6, 2023

Bot please update playwright snapshots

Copy link
Contributor

github-actions bot commented Nov 6, 2023

Playwright windows-latest snapshots updated.

Copy link
Contributor

github-actions bot commented Nov 6, 2023

Playwright ubuntu-22.04 snapshots updated.

@vidartf
Copy link
Collaborator Author

vidartf commented Nov 6, 2023

Bot please update playwright snapshots

Copy link
Contributor

github-actions bot commented Nov 6, 2023

Playwright windows-latest snapshots updated.

Copy link
Contributor

github-actions bot commented Nov 6, 2023

Playwright ubuntu-22.04 snapshots updated.

@vidartf vidartf closed this Nov 8, 2023
@vidartf vidartf reopened this Nov 8, 2023
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like the old version (a single green border) looked cleaner than the new one (a green border in grey outline).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are right, probably the rule shouldn't be added for the 1-way.

Copy link
Member

@krassowski krassowski Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is nicer here indeed.

Now borders are more similar to that of previous version,
except double borders are avoided if possible.
@vidartf
Copy link
Collaborator Author

vidartf commented Nov 8, 2023

Bot please update playwright snapshots

@vidartf
Copy link
Collaborator Author

vidartf commented Nov 8, 2023

Attempted tweak in++, and now also fixes #732.

Copy link
Contributor

github-actions bot commented Nov 8, 2023

Playwright windows-latest snapshots updated.

Copy link
Contributor

github-actions bot commented Nov 8, 2023

Playwright ubuntu-22.04 snapshots updated.

Copy link
Member

@krassowski krassowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks that instead of collapsing the border it now adds a tiny gap which also appears fine I think.

packages/nbdime/src/styles/common.css Outdated Show resolved Hide resolved
vidartf and others added 2 commits November 10, 2023 09:56
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
Including fixing a broken style that used a private variable.
@vidartf
Copy link
Collaborator Author

vidartf commented Nov 10, 2023

It looks that instead of collapsing the border it now adds a tiny gap which also appears fine I think.

Thanks for pointing it out. Rerending via the bot was the last thing I did on Wednesday EOD. I rely on it since #729 prevents UI test from being useful locally for me.

@vidartf
Copy link
Collaborator Author

vidartf commented Nov 10, 2023

Bot please update playwright snapshots

Copy link
Contributor

Playwright windows-latest snapshots updated.

Copy link
Contributor

Playwright ubuntu-22.04 snapshots updated.

@vidartf vidartf closed this Nov 10, 2023
@vidartf vidartf reopened this Nov 10, 2023
@vidartf vidartf merged commit 2f54b80 into jupyter:master Nov 10, 2023
14 checks passed
@vidartf vidartf deleted the fix-mergepane-border branch November 21, 2023 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CM6: Conflicting cell ops (deleted/added) are missing color highlighting
2 participants