Mercurial > hg
changeset 17582:495d3c671a8b stable
merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 17 Sep 2012 15:13:03 -0500 |
parents | cbacb5a813dd (current diff) ffe3630cb243 (diff) |
children | 55724f42fa14 536fee6a5486 |
files | |
diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/gitweb/graph.tmpl Wed Sep 05 22:42:23 2012 -0400 +++ b/mercurial/templates/gitweb/graph.tmpl Mon Sep 17 15:13:03 2012 -0500 @@ -59,7 +59,7 @@ this.ctx.fill(); var bg = '<li class="bg parity' + parity + '"></li>'; - var left = (this.columns + 1) * this.bg_height; + var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; var nstyle = 'padding-left: ' + left + 'px;'; var tagspan = '';
--- a/mercurial/templates/monoblue/graph.tmpl Wed Sep 05 22:42:23 2012 -0400 +++ b/mercurial/templates/monoblue/graph.tmpl Mon Sep 17 15:13:03 2012 -0500 @@ -57,7 +57,7 @@ this.ctx.fill(); var bg = '<li class="bg parity' + parity + '"></li>'; - var left = (this.columns + 1) * this.bg_height; + var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; var nstyle = 'padding-left: ' + left + 'px;'; var tagspan = '';
--- a/mercurial/templates/paper/graph.tmpl Wed Sep 05 22:42:23 2012 -0400 +++ b/mercurial/templates/paper/graph.tmpl Mon Sep 17 15:13:03 2012 -0500 @@ -70,7 +70,7 @@ this.ctx.fill(); var bg = '<li class="bg parity' + parity + '"></li>'; - var left = (this.columns + 1) * this.bg_height; + var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; var nstyle = 'padding-left: ' + left + 'px;'; var tagspan = '';
--- a/mercurial/templates/spartan/graph.tmpl Wed Sep 05 22:42:23 2012 -0400 +++ b/mercurial/templates/spartan/graph.tmpl Mon Sep 17 15:13:03 2012 -0500 @@ -51,7 +51,7 @@ this.ctx.fill(); var bg = '<li class="bg parity' + parity + '"></li>'; - var left = (this.columns + 1) * this.bg_height; + var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; var nstyle = 'padding-left: ' + left + 'px;'; var item = '<li style="' + nstyle + '"><span class="desc">'; item += '<a href="{url}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
--- a/tests/test-hgweb-commands.t Wed Sep 05 22:42:23 2012 -0400 +++ b/tests/test-hgweb-commands.t Mon Sep 17 15:13:03 2012 -0500 @@ -988,7 +988,7 @@ this.ctx.fill(); var bg = '<li class="bg parity' + parity + '"></li>'; - var left = (this.columns + 1) * this.bg_height; + var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; var nstyle = 'padding-left: ' + left + 'px;'; var tagspan = '';
--- a/tests/test-hgweb-empty.t Wed Sep 05 22:42:23 2012 -0400 +++ b/tests/test-hgweb-empty.t Mon Sep 17 15:13:03 2012 -0500 @@ -258,7 +258,7 @@ this.ctx.fill(); var bg = '<li class="bg parity' + parity + '"></li>'; - var left = (this.columns + 1) * this.bg_height; + var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; var nstyle = 'padding-left: ' + left + 'px;'; var tagspan = '';