mirror
/
gitea
mirror of https://github.com/go-gitea/gitea
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix unified diff view styling (#585)

Browse Source 
Signed-off-by: Manuel Kuhlmann <manuel@mkuhlmann.org>
pull/589/head
Manuel Kuhlmann 8 years ago committed by Lunny Xiao
parent a5e07da8be
commit eb9ce39bb7
3 changed files with 54 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 38
      public/css/index.css
  2. 48
      public/less/_repository.less
  3. 2
      templates/repo/diff/box.tmpl

38
public/css/index.css
Unescape View File

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

48
public/less/_repository.less
Unescape View File

@ -922,24 +922,6 @@
// } // }
// } // }
// 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) {
background-color: #fafafa;
}
&.del-code td:nth-child(1), &.del-code td:nth-child(2),
td.del-code {
background-color: #ffe0e0 !important;
border-color: #f1c0c0 !important;
}
&.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 {
background-color: #ff9999; background-color: #ff9999;
} }
@ -949,6 +931,36 @@
} }
} }
} }
.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) {
background-color: #fafafa;
}
&.del-code td:nth-child(1), &.del-code td:nth-child(2),
td.del-code {
background-color: #ffe0e0 !important;
border-color: #f1c0c0 !important;
}
&.add-code td:nth-child(3), &.add-code td:nth-child(4),
td.add-code{
background-color: #d6fcd6 !important;
border-color: #c1e9c1 !important;
}
}
&.file-content { &.file-content {
img { img {
max-width: 100%; max-width: 100%;

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

@ -85,7 +85,7 @@
<img src="{{$.RawPath}}/{{EscapePound .Name}}"> <img src="{{$.RawPath}}/{{EscapePound .Name}}">
</div> </div>
{{else}} {{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> <table>
<tbody> <tbody>
{{if $.IsSplitStyle}} {{if $.IsSplitStyle}}

Write Preview
Loading…
Cancel
Save