-
-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Fix blame row height alignment #15863
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
Conversation
I think this is the third time now that this alignment broke. Blame should really be refactored to be line-based and not two columns side-by-side, but I guess we can workaround for now by manually aligning again. |
Tested, working, except Safari which needs one additional fix to prevent line wrapping breaking the alignment: diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index e44e2ab84..c3a7f6ca2 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -1503,8 +1503,9 @@ a.ui.label:hover {
.blame .code-inner {
white-space: pre;
word-break: normal;
+ word-wrap: normal; /* not using overflow-wrap because safari does not treat is an an alias */
}
.lines-commit {
vertical-align: top; Normally |
Codecov Report
@@ Coverage Diff @@
## main #15863 +/- ##
==========================================
- Coverage 44.00% 44.00% -0.01%
==========================================
Files 681 681
Lines 82257 82270 +13
==========================================
+ Hits 36199 36201 +2
- Misses 40150 40161 +11
Partials 5908 5908
Continue to review full report at Codecov.
|
I think we need a backport of this to 1.14 too. |
Yeah looks like it. |
* fix blame row alignment on firefox * fix blame row alignment in chrome * fix blame row alignment in safari Co-authored-by: techknowlogick <[email protected]>
* fix blame row alignment on firefox * fix blame row alignment in chrome * fix blame row alignment in safari Co-authored-by: techknowlogick <[email protected]>
* fix blame row alignment on firefox * fix blame row alignment in chrome * fix blame row alignment in safari as per @silverwind Co-authored-by: techknowlogick <[email protected]>
fixes #15858 (check there for a screenshot)
I'm not a CSS guru, so my approach may be suboptimal:
We ensure all rows have at least 20px height, and
.bottom-line
rows get 21px, to reproduce in.lines-commit
what was already configured in for the code view.I tested in current FF and chromium, would be nice if someone could test on Safari as well.