FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit 11bacadd authored by Andrew Rice's avatar Andrew Rice
Browse files

corrected a few formatting bugs

parent f62cb759
No related branches found
No related tags found
No related merge requests found
......@@ -66,16 +66,18 @@ current = "none"
${file.oldPath()}
</div>
<#list file.lines() as line>
<#if line.operation() == "INSERT">
<div class="insert"></div>
<#if line.original() == "" && line.replacement() != "">
<div class="context"></div>
<#elseif line.operation() == "INSERT">
<div class="context"></div>
<#elseif line.operation() == "DELETE">
<div class="delete">${line.original()}</div>
<#elseif line.operation() == "MODIFY" && line.original() != "">
<div class="delete">${line.original()}</div>
<div class="delete">${line.original()?no_esc}</div>
<#elseif line.operation() == "MODIFY" && line.original() != line.replacement()>
<div class="delete">${line.original()?no_esc}</div>
<#elseif line.operation() == "OMITTED">
<div class="space">&hellip;</div>
<#else>
<div class="context">${line.original()}</div>
<div class="context">${line.original()?no_esc}</div>
</#if>
</#list>
</div>
......@@ -84,16 +86,18 @@ current = "none"
${file.newPath()}
</div>
<#list file.lines() as line>
<#if line.operation() == "INSERT">
<div class="insert">${line.replacement()}</div>
<#if line.replacement() == "" && line.original() != "">
<div class="context"></div>
<#elseif line.operation() == "INSERT">
<div class="insert">${line.replacement()?no_esc}</div>
<#elseif line.operation() == "DELETE">
<div class="insert"></div>
<#elseif line.operation() == "MODIFY">
<div class="insert">${line.replacement()}</div>
<div class="context"></div>
<#elseif line.operation() == "MODIFY" && line.original() != line.replacement()>
<div class="insert">${line.replacement()?no_esc}</div>
<#elseif line.operation() == "OMITTED">
<div class="space">&hellip;</div>
<#else>
<div class="context">${line.replacement()}</div>
<div class="context">${line.replacement()?no_esc}</div>
</#if>
</#list>
</div>
......@@ -109,16 +113,18 @@ current = "none"
${file.newPath()}
</div>
<#list file.lines() as line>
<#if line.operation() == "INSERT">
<div class="insert">${line.replacement()}</div>
<#if line.replacement() == "" && line.original() !="">
<div class="context"></div>
<#elseif line.operation() == "INSERT">
<div class="insert">${line.replacement()?no_esc}</div>
<#elseif line.operation() == "DELETE">
<div>${line.replacement()}</div>
<#elseif line.operation() == "MODIFY">
<div class="insert">${line.replacement()}</div>
<div class="insert">${line.replacement()?no_esc}</div>
<#elseif line.operation() == "OMITTED">
<div class="space">&hellip;</div>
<#else>
<div>${line.replacement()}</div>
<div class="context">${line.replacement()?no_esc}</div>
</#if>
</#list>
</div>
......
......@@ -12,26 +12,29 @@ code {
background-color: lavenderblush;
white-space: pre;
height: 1.5em;
overflow: hidden;
text-overflow: ellipsis;
}
.insert {
background-color: #e2fee2;
white-space: pre;
height: 1.5em;
overflow: hidden;
text-overflow: ellipsis;
}
.context {
white-space: pre;
height: 1.5em;
overflow: hidden;
text-overflow: ellipsis;
}
.side {
float: left;
font-family: monospace;
padding-right: 1em;
padding-left: 1em;
margin:0;
width: 50%;
white-space: nowrap;
overflow: hidden;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment