Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorPatrick Mezard <patrick@mezard.eu>
Mon, 17 Sep 2012 21:53:50 +0200
changeset 17581 54c832922e85
parent 17574 81a033bb29bc (current diff)
parent 17580 ffe3630cb243 (diff)
child 17583 55724f42fa14
child 17584 61cd71dc3797
Merge with stable
tests/test-hgweb-commands.t file | annotate | diff | comparison | revisions 
--- a/mercurial/templates/gitweb/graph.tmpl	Sat Sep 15 21:43:05 2012 +0200
+++ b/mercurial/templates/gitweb/graph.tmpl	Mon Sep 17 21:53:50 2012 +0200
@@ -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	Sat Sep 15 21:43:05 2012 +0200
+++ b/mercurial/templates/monoblue/graph.tmpl	Mon Sep 17 21:53:50 2012 +0200
@@ -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	Sat Sep 15 21:43:05 2012 +0200
+++ b/mercurial/templates/paper/graph.tmpl	Mon Sep 17 21:53:50 2012 +0200
@@ -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	Sat Sep 15 21:43:05 2012 +0200
+++ b/mercurial/templates/spartan/graph.tmpl	Mon Sep 17 21:53:50 2012 +0200
@@ -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	Sat Sep 15 21:43:05 2012 +0200
+++ b/tests/test-hgweb-commands.t	Mon Sep 17 21:53:50 2012 +0200
@@ -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	Sat Sep 15 21:43:05 2012 +0200
+++ b/tests/test-hgweb-empty.t	Mon Sep 17 21:53:50 2012 +0200
@@ -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 = '';
Mercurial