| Line 15 | Line 15 |
|---|
// <![CDATA[
function resize_panel()
{
|
// <![CDATA[
function resize_panel()
{
|
var block = document.getElementById('codepanel');
| var block = document.getElementById('diff_content');
|
var height;
if (window.innerHeight)
{
|
var height;
if (window.innerHeight)
{
|
height = window.innerHeight - 150;
| height = window.innerHeight - 200;
|
block.style.height = height + 'px';
}
else
| block.style.height = height + 'px';
}
else
|
| Line 28 | Line 28 |
|---|
//whatever IE needs to do this
}
}
|
//whatever IE needs to do this
}
}
|
| |
window.onresize = resize_panel;
|
// ]]>
</script>
<style type="text/css">
|
// ]]>
</script>
<style type="text/css">
|
<!--
| /* <![CDATA[ */
|
#main {
font-size: 1em;
|
#main {
font-size: 1em;
|
| Line 48 | Line 51 |
|---|
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
div#codepanel {
|
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
div#codepanel {
|
overflow: auto;
| |
width: 100%;
|
width: 100%;
|
height: 350px;
display: inline-block;
| |
}
<!-- ELSE -->
div#codepanel {
background-color: #eee;
|
}
<!-- ELSE -->
div#codepanel {
background-color: #eee;
|
| | }
<!-- ENDIF -->
<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' -->
div#diff_content pre {
overflow: auto;
height: 414px;
width: 100% !important;
|
}
<!-- ENDIF -->
| }
<!-- ENDIF -->
|
| Line 65 | Line 73 |
|---|
*/
.file {
line-height: .7em;
|
*/
.file {
line-height: .7em;
|
| | overflow: auto;
height: 414px;
|
}
.diff {
| }
.diff {
|
| Line 109 | Line 119 |
|---|
overflow: hidden;
border-bottom: 1px solid #999;
table-layout: fixed;
|
overflow: hidden;
border-bottom: 1px solid #999;
table-layout: fixed;
|
| | background: transparent;
|
}
table.hrdiff th {
| }
table.hrdiff th {
|
| Line 118 | Line 129 |
|---|
font-family: Verdana,Helvetica,sans-serif;
font-size: 11px;
border-bottom: 1px solid #999;
|
font-family: Verdana,Helvetica,sans-serif;
font-size: 11px;
border-bottom: 1px solid #999;
|
background: transparent;
| border-right: 1px solid #999;
background: #D9D9D9;
|
}
table.hrdiff thead th {
| }
table.hrdiff thead th {
|
| Line 132 | Line 144 |
|---|
}
table.hrdiff tbody th {
|
}
table.hrdiff tbody th {
|
padding: 2em 1px 1px 1px;
| |
font-size: 80%;
border-top: 1px solid #999;
}
|
font-size: 80%;
border-top: 1px solid #999;
}
|
table.hrdiff tbody td.old {
border-left: 1px solid #999;
border-right: 1px solid #999;
}
table.hrdiff tbody td.new {
| table.hrdiff tbody td {
|
border-right: 1px solid #999;
}
table.hrdiff td pre {
|
border-right: 1px solid #999;
}
table.hrdiff td pre {
|
overflow: auto;
display: block;
width: 100%;
overflow: auto;
display: block;
| font-family: "Consolas", monospace;
font-size: 1.1em;
white-space: pre-wrap; /* css-3 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
|
}
table.hrdiff .unmodified {
|
}
table.hrdiff .unmodified {
|
background: #fff;
| background: transparent;
|
}
table.hrdiff .added {
| }
table.hrdiff .added {
|
| Line 198 | Line 204 |
|---|
<!-- ENDIF -->
|
<!-- ENDIF -->
|
//-->
| /* ]]> */
|
</style>
</head>
|
</style>
</head>
|
| |
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
|
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
|
<body onresize="resize_panel();" onload="resize_panel();">
| <body onload="resize_panel();">
|
<!-- ELSE -->
<body>
<!-- ENDIF -->
| <!-- ELSE -->
<body>
<!-- ENDIF -->
|
| Line 220 | Line 225 |
|---|
<!-- ENDIF -->
<!-- IF not S_DIFF_NEW_FILE -->
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
|
<!-- ENDIF -->
<!-- IF not S_DIFF_NEW_FILE -->
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
|
<form method="post">
| <form method="post" action="">
|
<fieldset class="quick">
<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
| <fieldset class="quick">
<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
|
| Line 228 | Line 233 |
|---|
<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
</fieldset>
</form>
|
<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
</fieldset>
</form>
|
| | <!-- ENDIF -->
<!-- IF S_DIFF_CONFLICT_FILE -->
<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
<br style="clear: both;" />
|
<!-- ENDIF -->
</div>
| <!-- ENDIF -->
</div>
|
| Line 237 | Line 246 |
|---|
<span class="corners-top"><span></span></span>
<div id="diff_content">
<div id="main">
|
<span class="corners-top"><span></span></span>
<div id="diff_content">
<div id="main">
|
<!-- IF S_DIFF_CONFLICT_FILE -->
<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
<!-- ENDIF -->
| |
{DIFF_CONTENT}
</div>
</div>
| {DIFF_CONTENT}
</div>
</div>
|
