Merge lp:~blr/loggerhead/bug-1436483-sbs-diff-css-fix into lp:loggerhead

Proposed by Kit Randel on 2015-06-30
Status: Merged
Merged at revision: 489
Proposed branch: lp:~blr/loggerhead/bug-1436483-sbs-diff-css-fix
Merge into: lp:loggerhead
Diff against target: 12 lines (+1/-1)
1 file modified
loggerhead/static/css/diff.css (+1/-1)
To merge this branch: bzr merge lp:~blr/loggerhead/bug-1436483-sbs-diff-css-fix
Reviewer Review Type Date Requested Status
Riccardo Padovani (community) Approve on 2015-06-30
Loggerhead Reviewers 2015-06-30 Pending
Review via email: mp+263425@code.launchpad.net

Commit message

Fix wrapping layout of sbs diff.

Description of the change

A fix to correct the rending of line numbers in diffs (https://bugs.launchpad.net/loggerhead/+bug/310255) unfortunately affected the rendering of sbs diffs (https://bugs.launchpad.net/loggerhead/+bug/1436483).

This ┬Ábranch fix should satisfy both.

To post a comment you must log in.
Riccardo Padovani (rpadovani) wrote :

I tested on Chromium and indeed it works well.

There is a regression on bug #310255 if the width of the browser is < ~1050px, but I think could be acceptable (or at least it improves a lot the actual situation)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loggerhead/static/css/diff.css'
2--- loggerhead/static/css/diff.css 2015-03-17 11:38:32 +0000
3+++ loggerhead/static/css/diff.css 2015-06-30 21:36:03 +0000
4@@ -55,7 +55,7 @@
5 border-bottom: 1px solid #d5d5d5;
6 }
7 .lineNumber {
8- width: 3%;
9+ width: 2.5%;
10 border-width: 0 1px;
11 border-style: solid;
12 border-color: #d5d5d5;

Subscribers

People subscribed via source and target branches