specialApe
/
gitea-1156
forked from Gitlink/gitea-1156
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unified diff view styling (#585) 

Signed-off-by: Manuel Kuhlmann <manuel@mkuhlmann.org>
This commit is contained in:
Manuel Kuhlmann 2017-01-05 03:04:41 +01:00 committed by Lunny Xiao
parent a5e07da8be
commit eb9ce39bb7
3 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
public/css/index.css
View File

@ -1992,30 +1992,38 @@ footer .ui.language .menu {
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;
border-color: #f1c0c0 !important;
}
.repository .diff-file-box .code-diff tbody tr.add-code td:nth-child(3),
.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 {
background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important;
}
.repository .diff-file-box .code-diff tbody tr .removed-code {
background-color: #ff9999;
}
.repository .diff-file-box .code-diff tbody tr .added-code {
background-color: #99ff99;
}
.repository .diff-file-box .code-diff-unified tbody tr.del-code td {
background-color: #ffe0e0 !important;
border-color: #f1c0c0 !important;
}
.repository .diff-file-box .code-diff-unified tbody tr.add-code td {
background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important;
}
.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(1),
.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(2),
.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(3),
.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(4) {
background-color: #fafafa;
}
.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(1),
.repository .diff-file-box .code-diff-split tbody tr.del-code td:nth-child(2),
.repository .diff-file-box .code-diff-split tbody tr td.del-code {
background-color: #ffe0e0 !important;
border-color: #f1c0c0 !important;
}
.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(3),
.repository .diff-file-box .code-diff-split tbody tr.add-code td:nth-child(4),
.repository .diff-file-box .code-diff-split tbody tr td.add-code {
background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important;
}
.repository .diff-file-box.file-content img {
max-width: 100%;
padding: 5px 5px 0 5px;

30
public/less/_repository.less
View File

@ -922,6 +922,27 @@
// }
// }
.removed-code {
background-color: #ff9999;
}
.added-code {
background-color: #99ff99;
}
}
}
}
.code-diff-unified tbody tr {
&.del-code td {
background-color: #ffe0e0 !important;
border-color: #f1c0c0 !important;
}
&.add-code td {
background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important;
}
}
.code-diff-split tbody tr {
// light gray for empty lines before / after commit
&.add-code td:nth-child(1), &.add-code td:nth-child(2),
&.del-code td:nth-child(3), &.del-code td:nth-child(4) {
@ -939,15 +960,6 @@
background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important;
}
.removed-code {
background-color: #ff9999;
}
.added-code {
background-color: #99ff99;
}
}
}
}
&.file-content {
img {

2
templates/repo/diff/box.tmpl
View File

@ -85,7 +85,7 @@
<img src="{{$.RawPath}}/{{EscapePound .Name}}">
</div>
{{else}}
<div class="file-body file-code code-view code-diff">
<div class="file-body file-code code-view code-diff {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}}">
<table>
<tbody>
{{if $.IsSplitStyle}}