third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix fileview rendering bug #2470 (#2477)

Browse Source
tokarchuk/v1.17
Albert 7 years ago committed by Kim "BKC" Carlbäcker
parent fd85e25f5f
commit 250f1236dc
3 changed files with 30 additions and 8 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. 12
      public/css/index.css
  2. 12
      public/less/_repository.less
  3. 4
      templates/repo/diff/box.tmpl

12
public/css/index.css
Unescape View File

@ -2063,9 +2063,14 @@ footer .ui.language .menu {
.repository .diff-detail-box span.status.rename { .repository .diff-detail-box span.status.rename {
background-color: #dad8ff; background-color: #dad8ff;
} }
.repository .diff-box {
display: flex;
align-items: center;
}
.repository .diff-box .count { .repository .diff-box .count {
margin-right: 12px; margin-right: 12px;
font-size: 13px; font-size: 13px;
flex: 0 0 auto;
} }
.repository .diff-box .count .bar { .repository .diff-box .count .bar {
background-color: #bd2c00; background-color: #bd2c00;
@ -2080,7 +2085,14 @@ footer .ui.language .menu {
height: 12px; height: 12px;
} }
.repository .diff-box .file { .repository .diff-box .file {
flex: 0 1 100%;
color: #888; color: #888;
word-break: break-all;
}
.repository .diff-box .button {
margin: -5px 0 -5px 12px;
padding: 8px 10px;
flex: 0 0 auto;
} }
.repository .diff-file-box .header { .repository .diff-file-box .header {
background-color: #f7f7f7; background-color: #f7f7f7;

12
public/less/_repository.less
Unescape View File

@ -888,9 +888,13 @@
} }
} }
.diff-box { .diff-box {
display: flex;
align-items: center;
.count { .count {
margin-right: 12px; margin-right: 12px;
font-size: 13px; font-size: 13px;
flex: 0 0 auto;
.bar { .bar {
background-color: #bd2c00; background-color: #bd2c00;
@ -906,7 +910,15 @@
} }
} }
.file { .file {
flex: 0 1 100%;
color: #888; color: #888;
word-break: break-all;
}
.button {
margin: -5px 0 -5px 12px;
padding: 8px 10px;
flex: 0 0 auto;
} }
} }
.diff-file-box { .diff-file-box {

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

@ -54,7 +54,7 @@
{{else}} {{else}}
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}"> <div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}" id="diff-{{.Index}}">
<h4 class="ui top attached normal header"> <h4 class="ui top attached normal header">
<div class="diff-counter count ui left"> <div class="diff-counter count">
{{if $file.IsBin}} {{if $file.IsBin}}
{{$.i18n.Tr "repo.diff.bin"}} {{$.i18n.Tr "repo.diff.bin"}}
{{else if not $file.IsRenamed}} {{else if not $file.IsRenamed}}
@ -68,13 +68,11 @@
</div> </div>
<span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span> <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span>
{{if not $file.IsSubmodule}} {{if not $file.IsSubmodule}}
<div class="ui right">
{{if $file.IsDeleted}} {{if $file.IsDeleted}}
<a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
{{else}} {{else}}
<a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> <a class="ui basic grey tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
{{end}} {{end}}
</div>
{{end}} {{end}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">

Write Preview
Loading…
Cancel
Save