Patchwork [STABLE] hgweb: resurrect <span> tag on diffline to fix rendering in monoblue style

login
register
mail settings
Submitter Yuya Nishihara
Date April 2, 2015, 1:01 p.m.
Message ID <e059ad141ffe79e5fe0f.1427979666@mimosa>
Download mbox | patch
Permalink /patch/8451/
State Accepted
Headers show

Comments

Yuya Nishihara - April 2, 2015, 1:01 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1427977745 -32400
#      Thu Apr 02 21:29:05 2015 +0900
# Branch stable
# Node ID e059ad141ffe79e5fe0fd9be7c23f7d149941c33
# Parent  b09e5150bf8f34f47ec0bb29301d4bf587298a4b
hgweb: resurrect <span> tag on diffline to fix rendering in monoblue style

It was removed at 606a3bf82e30 as a useless tag, but it is necessary to
apply "div.diff pre span" style.

http://selenic.com/repo/hg/rev/606a3bf82e30?style=monoblue
Matt Mackall - April 2, 2015, 4:25 p.m.
On Thu, 2015-04-02 at 22:01 +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1427977745 -32400
> #      Thu Apr 02 21:29:05 2015 +0900
> # Branch stable
> # Node ID e059ad141ffe79e5fe0fd9be7c23f7d149941c33
> # Parent  b09e5150bf8f34f47ec0bb29301d4bf587298a4b
> hgweb: resurrect <span> tag on diffline to fix rendering in monoblue style

Thanks, queued for stable.

Patch

diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map
--- a/mercurial/templates/monoblue/map
+++ b/mercurial/templates/monoblue/map
@@ -103,7 +103,7 @@  annotateline = '
 difflineplus = '<span class="difflineplus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
 difflineminus = '<span class="difflineminus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
 difflineat = '<span class="difflineat"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
-diffline = '<a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
+diffline = '<span><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
 
 comparisonblock ='
   <tbody class="block">