# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1347912783 18000
# Node ID 495d3c671a8b01f19d5bfdafbbba908331d98879
# Parent  cbacb5a813dd56fe515d2852179d9c2be3f0ef7a# Parent  ffe3630cb243d1bd0918058f04215a9051e3b2b3
merge with crew

diff -r cbacb5a813dd -r 495d3c671a8b mercurial/templates/gitweb/graph.tmpl
--- 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 = '';
diff -r cbacb5a813dd -r 495d3c671a8b mercurial/templates/monoblue/graph.tmpl
--- 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 = '';
diff -r cbacb5a813dd -r 495d3c671a8b mercurial/templates/paper/graph.tmpl
--- 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 = '';
diff -r cbacb5a813dd -r 495d3c671a8b mercurial/templates/spartan/graph.tmpl
--- 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>';
diff -r cbacb5a813dd -r 495d3c671a8b tests/test-hgweb-commands.t
--- 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 = '';
diff -r cbacb5a813dd -r 495d3c671a8b tests/test-hgweb-empty.t
--- 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 = '';