From 8a45281801ade7524dbdee423c28b326051719de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Dec 2021 18:39:47 +0100 Subject: view: Wrap contents of diff lines with pre. Fixes . --- assets/css/screen.css | 7 +++++++ mumi/web/view/utils.scm | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/assets/css/screen.css b/assets/css/screen.css index f493990..e4dcc10 100644 --- a/assets/css/screen.css +++ b/assets/css/screen.css @@ -377,6 +377,13 @@ details { } /* diff styles */ +div.line pre { + margin: 0; + font-family: inherit; + font-size: inherit; + color: inherit; +} + .message .diff div.line.diff.file { color: #005cc5; } diff --git a/mumi/web/view/utils.scm b/mumi/web/view/utils.scm index 0a43b06..9789d03 100644 --- a/mumi/web/view/utils.scm +++ b/mumi/web/view/utils.scm @@ -80,22 +80,22 @@ with the next context." (cond ((string= "---" line) `(div (@ (class "line diff separator")) - ,line-anchor ,line)) + ,line-anchor (pre ,line))) ((string-prefix? "+" line) `(div (@ (class "line diff addition")) - ,line-anchor ,line)) + ,line-anchor (pre ,line))) ((and (string-prefix? "-" line) (not (string= "--" line)) (not (string= "-- " line))) `(div (@ (class "line diff deletion")) - ,line-anchor ,line)) + ,line-anchor (pre ,line))) ((string-prefix? "@@" line) `(div (@ (class "line diff range")) - ,line-anchor ,line)) + ,line-anchor (pre ,line))) (else `(div (@ (class "line")) ,line-anchor - ,line))))) + (pre ,line)))))) (values (cons (add-block-line! block formatted-line) other-blocks) context)))) -- cgit v1.2.3