Merge lp:~cruzjbishop/loggerhead/fix-310255 into lp:loggerhead

Proposed by Cruz Bishop on 2012-05-02
Status: Merged
Approved by: Colin Watson on 2015-03-17
Approved revision: 476
Merged at revision: 484
Proposed branch: lp:~cruzjbishop/loggerhead/fix-310255
Merge into: lp:loggerhead
Diff against target: 21 lines (+2/-2)
1 file modified
loggerhead/static/css/diff.css (+2/-2)
To merge this branch: bzr merge lp:~cruzjbishop/loggerhead/fix-310255
Reviewer Review Type Date Requested Status
John A Meinel 2012-05-02 Approve on 2012-05-02
Review via email: mp+104379@code.launchpad.net

Description of the change

Fix for bug #310255

This merge will increase the width of each line number box by 1%, preventing formatting anomalies when numbers reach six or more digits

Example after this merge: http://i.imgur.com/WnwBl.png

Originally (not in current builds), the output looked as such: https://launchpadlibrarian.net/20618129/screenshot_100%28084%29.png

However, on a Launchpad/Trunk build, this no longer happens; The numbers are more uneven than anything else.

http://i.imgur.com/TZl9F.png

To post a comment you must log in.
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 5/2/2012 2:39 PM, Cruz Bishop wrote:
> Cruz Bishop has proposed merging
> lp:~cruzjbishop/loggerhead/fix-310255 into lp:loggerhead.
>
> Requested reviews: Loggerhead Reviewers (loggerhead-reviewers)
> Related bugs: Bug #310255 in loggerhead: "6 digit line numbers get
> cutoff" https://bugs.launchpad.net/loggerhead/+bug/310255
>
> For more details, see:
> https://code.launchpad.net/~cruzjbishop/loggerhead/fix-310255/+merge/104379
>
> Fix for bug #310255
>
> This merge will increase the width of each line number box by 1%,
> preventing formatting anomalies when numbers reach six or more
> digits
>
> Example after this merge: http://i.imgur.com/WnwBl.png

Do you have an example from before this change?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+hSw8ACgkQJdeBCYSNAAMTTQCgkEdjelHdpajO60N6mt8R69cG
nV8AoLDOefAZL3hJpPNoBFSzc9AfcDB4
=1nR7
-----END PGP SIGNATURE-----

John A Meinel (jameinel) wrote :

This seems ok, but it makes me wonder if there is a better way to force it to have a minimum width based on the entries themselves.

That said, this is probably a reasonable stopgap measure.

review: Approve
Cruz Bishop (cruzjbishop) wrote :

I've updated the description to match more recent builds and include some pre-merge screenshots

@jameinel Removing the padding to the left of the line numbers worked to a certain degree, but it still came out uglier than before, so I changed it to this

Cruz Bishop (cruzjbishop) wrote :

Sorry, accidentally marked this as merged.

Is there any news on this? Richard/lifeless marked it as fix released, even though it wasn't merged, so I'm assuming that either I overlooked something or somebody else got in first.

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 2012-03-28 20:45:44 +0000
3+++ loggerhead/static/css/diff.css 2012-05-02 12:38:19 +0000
4@@ -55,7 +55,7 @@
5 border-bottom: 1px solid #d5d5d5;
6 }
7 .lineNumber {
8- width: 2%;
9+ width: 3%;
10 border-width: 0 1px;
11 border-style: solid;
12 border-color: #d5d5d5;
13@@ -74,7 +74,7 @@
14 font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace;
15 }
16 .unified .code {
17- width: 89%;
18+ width: 87%;
19 }
20 .sbs .code {
21 width: 43%;

Subscribers

People subscribed via source and target branches