tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Fix diff split view coloring (#553) (#584)

Browse source 
Signed-off-by: Manuel Kuhlmann <manuel@mkuhlmann.org>
This commit is contained in:
Manuel Kuhlmann 2017-01-05 02:07:43 +01:00 committed by Lunny Xiao
parent c5f0d4b1a0
commit a5e07da8be
3 changed files with 50 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
public/css/index.css
View file

@ -1982,32 +1982,34 @@ footer .ui.language .menu {
border-right: 1px solid #d4d4d5; border-right: 1px solid #d4d4d5;
padding: 0 5px; padding: 0 5px;
} }
.repository .diff-file-box .code-diff tbody tr.tag-code td, .repository .diff-file-box .code-diff tbody tr td.halfwidth {
.repository .diff-file-box .code-diff tbody tr.tag-code pre {
background-color: #F0F0F0 !important;
border-color: #D2CECE!important;
padding-top: 4px;
padding-bottom: 4px;
}
.repository .diff-file-box .code-diff tbody tr.tag-code td.halfwidth {
width: 50%; width: 50%;
} }
.repository .diff-file-box .code-diff tbody tr.del-code td, .repository .diff-file-box .code-diff tbody tr.tag-code td,
.repository .diff-file-box .code-diff tbody tr.del-code pre { .repository .diff-file-box .code-diff tbody tr td.tag-code {
background-color: #F0F0F0 !important;
border-color: #D2CECE !important;
padding-top: 8px;
padding-bottom: 8px;
}
.repository .diff-file-box .code-diff tbody tr.add-code td:nth-child(1),
.repository .diff-file-box .code-diff tbody tr.add-code td:nth-child(2),
.repository .diff-file-box .code-diff tbody tr.del-code td:nth-child(3),
.repository .diff-file-box .code-diff tbody tr.del-code td:nth-child(4) {
background-color: #fafafa;
}
.repository .diff-file-box .code-diff tbody tr.del-code td:nth-child(1),
.repository .diff-file-box .code-diff tbody tr.del-code td:nth-child(2),
.repository .diff-file-box .code-diff tbody tr td.del-code {
background-color: #ffe0e0 !important; background-color: #ffe0e0 !important;
border-color: #f1c0c0 !important; border-color: #f1c0c0 !important;
} }
.repository .diff-file-box .code-diff tbody tr.del-code td.halfwidth { .repository .diff-file-box .code-diff tbody tr.add-code td:nth-child(3),
width: 50%; .repository .diff-file-box .code-diff tbody tr.add-code td:nth-child(4),
} .repository .diff-file-box .code-diff tbody tr td.add-code {
.repository .diff-file-box .code-diff tbody tr.add-code td,
.repository .diff-file-box .code-diff tbody tr.add-code pre {
background-color: #d6fcd6 !important; background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important; border-color: #c1e9c1 !important;
} }
.repository .diff-file-box .code-diff tbody tr.add-code td.halfwidth {
width: 50%;
}
.repository .diff-file-box .code-diff tbody tr .removed-code { .repository .diff-file-box .code-diff tbody tr .removed-code {
background-color: #ff9999; background-color: #ff9999;
} }

50
public/less/_repository.less
View file

@ -902,44 +902,42 @@
} }
tbody { tbody {
tr { tr {
td.halfwidth {
width: 50%;
}
&.tag-code { &.tag-code td, td.tag-code {
td, pre { background-color: #F0F0F0 !important;
background-color: #F0F0F0 !important; border-color: #D2CECE !important;
border-color: #D2CECE!important; padding-top: 8px;
padding-top: 4px; padding-bottom: 8px;
padding-bottom: 4px;
}
td.halfwidth {
width: 50%;
}
// td.selected-line, td.selected-line pre { // td.selected-line, td.selected-line pre {
// background-color: #ffffdd !important; // background-color: #ffffdd !important;
// } // }
} }
// &.same-code { // &.same-code {
// td.selected-line, td.selected-line pre { // td.selected-line, td.selected-line pre {
// background-color: #ffffdd !important; // background-color: #ffffdd !important;
// } // }
// } // }
&.del-code {
td, pre {
background-color: #ffe0e0 !important;
border-color: #f1c0c0 !important;
}
td.halfwidth { // light gray for empty lines before / after commit
width: 50%; &.add-code td:nth-child(1), &.add-code td:nth-child(2),
} &.del-code td:nth-child(3), &.del-code td:nth-child(4) {
background-color: #fafafa;
} }
&.add-code {
td, pre { &.del-code td:nth-child(1), &.del-code td:nth-child(2),
background-color: #d6fcd6 !important; td.del-code {
border-color: #c1e9c1 !important; background-color: #ffe0e0 !important;
} border-color: #f1c0c0 !important;
td.halfwidth { }
width: 50%;
} &.add-code td:nth-child(3), &.add-code td:nth-child(4),
td.add-code{
background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important;
} }
.removed-code { .removed-code {

9
templates/repo/diff/box.tmpl
View file

@ -133,16 +133,19 @@
{{if .IsSplitStyle}} {{if .IsSplitStyle}}
<script> <script>
(function() { (function() {
$('.add-code').each(function() { $('tr.add-code').each(function() {
var prev = $(this).prev(); var prev = $(this).prev();
if(prev.is('.del-code') && prev.children().eq(3).text().trim() === '') { if(prev.is('.del-code') && prev.children().eq(3).text().trim() === '') {
while(prev.prev().is('.del-code') && prev.prev().children().eq(3).text().trim() === '') { while(prev.prev().is('.del-code') && prev.prev().children().eq(3).text().trim() === '') {
prev = prev.prev(); prev = prev.prev();
} }
prev.children().eq(3).html($(this).children().eq(3).html());
prev.children().eq(2).html($(this).children().eq(2).html()); prev.children().eq(2).html($(this).children().eq(2).html());
prev.children().eq(3).addClass('add-code'); prev.children().eq(3).html($(this).children().eq(3).html());
prev.children().eq(0).addClass('del-code');
prev.children().eq(1).addClass('del-code');
prev.children().eq(2).addClass('add-code'); prev.children().eq(2).addClass('add-code');
prev.children().eq(3).addClass('add-code');
$(this).remove(); $(this).remove();
} }
}); });