aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/adm/style/install_update_diff.html4
-rw-r--r--phpBB/includes/diff/renderer.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 55f3d1cc49..58b9aa833f 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -42,7 +42,7 @@ function resize_panel()
width: 99%;
}
-<!-- IF DIFF_MODE neq 'side_by_side' -->
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
div#codepanel {
overflow: auto;
width: 100%;
@@ -199,7 +199,7 @@ table.hrdiff caption span {
</head>
-<!-- IF DIFF_MODE neq 'side_by_side' -->
+<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
<body onresize="resize_panel();" onload="resize_panel();">
<!-- ELSE -->
<body>
diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php
index ce9e8955aa..e920e9688f 100644
--- a/phpBB/includes/diff/renderer.php
+++ b/phpBB/includes/diff/renderer.php
@@ -515,7 +515,7 @@ class diff_renderer_raw extends diff_renderer
*/
function get_diff_content($diff)
{
- return '<textarea style="height: 400px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
+ return '<textarea style="height: 290px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
}
function _block_header($xbeg, $xlen, $ybeg, $ylen)