From 5b545e24ecf73908aa31571fa67f73c96fc6474d Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 19 Sep 2019 11:30:17 -0600
Subject: [PATCH] Etemplate: Fix sizing and layout for diffs when they're part
 of a multipart entry

---
 api/js/etemplate/et2_widget_historylog.js | 2 +-
 api/templates/default/etemplate2.css      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/api/js/etemplate/et2_widget_historylog.js b/api/js/etemplate/et2_widget_historylog.js
index 8f7b9e7940..5cebb32980 100644
--- a/api/js/etemplate/et2_widget_historylog.js
+++ b/api/js/etemplate/et2_widget_historylog.js
@@ -703,7 +703,7 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
 		if(this.dataview)
 		{
 			var columns = this.dataview.getColumnMgr().columnWidths;
-			jQuery('.et2_diff', this.div).parent().width(columns[this.NEW_VALUE] + columns[this.OLD_VALUE]);
+			jQuery('.et2_diff', this.div).closest('.innerContainer').width(columns[this.NEW_VALUE] + columns[this.OLD_VALUE]);
 		}
 	}
 });}).call(this);
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 8d3e1cc2d3..ce150502ca 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -613,7 +613,6 @@ div.et2_diff {
 	white-space:normal;
 }
 .et2_diff .d2h-file-wrapper {
-	margin: 0px;
 }
 .et2_diff .d2h-file-diff {
 	overflow-x: hidden;
@@ -629,7 +628,7 @@ div.et2_diff {
 	overflow-y: visible;
 }
 .et2_diff .ui-icon {
-  margin-top: -16px;
+  margin-top: -14px;
   float: right;
 }
 .et2_diff .d2h-del, .et2_diff.d2h-del.d2h-change, .et2_diff .d2h-file-diff .d2h-del.d2h-change  {