From 926c4d948f85919d1f05d51ee5f5899c7bf75097 Mon Sep 17 00:00:00 2001 From: nazoking Date: Mon, 4 Jan 2016 17:11:53 +0900 Subject: [PATCH 1/2] remove debug info --- src/main/twirl/gitbucket/core/helper/diff.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html index 40e9cb31a..7f18d8e45 100644 --- a/src/main/twirl/gitbucket/core/helper/diff.scala.html +++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html @@ -104,7 +104,7 @@ } else { @if(diff.newIsImage || diff.oldIsImage){ -
@diff.oldIsImage @diff.newIsImage +
@if(oldCommitId.isDefined && diff.oldIsImage){
} else { From d62fc6e1357a294aa7ce9a66618ba97eb1672041 Mon Sep 17 00:00:00 2001 From: nazoking Date: Mon, 4 Jan 2016 20:17:52 +0900 Subject: [PATCH 2/2] fix image-diff style --- src/main/webapp/assets/common/js/gitbucket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js index e1e75a2d2..df1f5001b 100644 --- a/src/main/webapp/assets/common/js/gitbucket.js +++ b/src/main/webapp/assets/common/js/gitbucket.js @@ -606,7 +606,7 @@ var imageDiff ={ .css({marginTop:size.height-5}); var bar = $('
').css({top:size.height+size.paddingTop}); var div = $('
') - .css({height:size.height+size.paddingTop, paddingLeft:size.padding}) + .css({height:size.height+size.paddingTop*2, paddingLeft:size.padding}) .append(diffOld, diffNew, bar, handle); return { neo:diffNew,