mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 18:44:46 +01:00 
			
		
		
		
	- Fix placement of avatar image, this was not placed in the `comment-header-left` and add CSS to cover the limiting of width+height of avatar for code-review comment on "Files changed" page. This fixes the big noticeable avatar issue. - Apply `margin-bottom` to the "next" button, so it's consistent with the "previous" button. - Make sure the "next"/"previous" start at `flex-start` on mobile and not off-screen at `flex-end`. As well force them to have `flex: 1` so they won't overflow on x-asis. This also requires the `width: 100%` for the `.ui.buttons` div. - Resolves #20074 ### Before <details><img width="512" src="https://user-images.githubusercontent.com/25481501/195952930-09560cad-419f-43a3-a8a4-a4166c117994.jpg"></details> ### After <details><img width="512" src="https://user-images.githubusercontent.com/25481501/197340081-0365dfa8-4344-46b4-8702-a40c778c073f.jpg"></details> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: silverwind <me@silverwind.io>
		
			
				
	
	
		
			156 lines
		
	
	
		
			9.7 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
			
		
		
	
	
			156 lines
		
	
	
		
			9.7 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
| {{$file := .file}}
 | |
| {{range $j, $section := $file.Sections}}
 | |
| 	{{range $k, $line := $section.Lines}}
 | |
| 		{{$hasmatch := ne $line.Match -1}}
 | |
| 		{{if or (ne .GetType 2) (not $hasmatch)}}
 | |
| 			<tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{DiffLineTypeToStr .GetType}}">
 | |
| 				{{if eq .GetType 4}}
 | |
| 					<td class="lines-num lines-num-old">
 | |
| 						{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
 | |
| 							<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | |
| 								{{svg "octicon-fold-down"}}
 | |
| 							</a>
 | |
| 						{{end}}
 | |
| 						{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}}
 | |
| 							<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=up&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | |
| 								{{svg "octicon-fold-up"}}
 | |
| 							</a>
 | |
| 						{{end}}
 | |
| 						{{if eq $line.GetExpandDirection 2}}
 | |
| 							<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | |
| 								{{svg "octicon-fold"}}
 | |
| 							</a>
 | |
| 						{{end}}
 | |
| 					</td>{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale}}
 | |
| 					<td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></a>{{end}}</td>
 | |
| 					<td colspan="6" class="lines-code lines-code-old ">{{/*
 | |
| 						*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | |
| 					*/}}</td>
 | |
| 				{{else if and (eq .GetType 3) $hasmatch}}{{/* DEL */}}
 | |
| 					{{$match := index $section.Lines $line.Match}}
 | |
| 					{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line $.root.locale}}{{end}}
 | |
| 					{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match $.root.locale}}{{end}}
 | |
| 					<td class="lines-num lines-num-old del-code" data-line-num="{{$line.LeftIdx}}"><span rel="diff-{{$file.NameHash}}L{{$line.LeftIdx}}"></span></td>
 | |
| 					<td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $leftDiff "locale" $.root.locale}}"></a>{{end}}{{end}}</td>
 | |
| 					<td class="lines-type-marker lines-type-marker-old del-code"><span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
 | |
| 					<td class="lines-code lines-code-old halfwidth del-code">{{/*
 | |
| 						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/*
 | |
| 							*/}}<a class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/*
 | |
| 								*/}}{{svg "octicon-plus"}}{{/*
 | |
| 							*/}}</a>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 						*/}}{{if $line.LeftIdx}}{{/*
 | |
| 							*/}}{{template "repo/diff/section_code" dict "diff" $leftDiff "locale" $.root.locale}}{{/*
 | |
| 						*/}}{{else}}{{/*
 | |
| 						*/}}<code class="code-inner"></code>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 					*/}}</td>
 | |
| 					<td class="lines-num lines-num-new add-code" data-line-num="{{if $match.RightIdx}}{{$match.RightIdx}}{{end}}"><span rel="{{if $match.RightIdx}}diff-{{$file.NameHash}}R{{$match.RightIdx}}{{end}}"></span></td>
 | |
| 					<td class="lines-escape add-code lines-escape-new">{{if $match.RightIdx}}{{if $rightDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $rightDiff "locale" $.root.locale}}"></a>{{end}}{{end}}</td>
 | |
| 					<td class="lines-type-marker lines-type-marker-new add-code">{{if $match.RightIdx}}<span class="mono" data-type-marker="{{$match.GetLineTypeMarker}}"></span>{{end}}</td>
 | |
| 					<td class="lines-code lines-code-new halfwidth add-code">{{/*
 | |
| 						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/*
 | |
| 							*/}}<a class="ui primary button add-code-comment add-code-comment-right{{if (not $match.CanComment)}} invisible{{end}}" data-side="right" data-idx="{{$match.RightIdx}}">{{/*
 | |
| 								*/}}{{svg "octicon-plus"}}{{/*
 | |
| 							*/}}</a>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 						*/}}{{if $match.RightIdx}}{{/*
 | |
| 							*/}}{{template "repo/diff/section_code" dict "diff" $rightDiff "locale" $.root.locale}}{{/*
 | |
| 						*/}}{{else}}{{/*
 | |
| 							*/}}<code class="code-inner"></code>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 					*/}}</td>
 | |
| 				{{else}}
 | |
| 					{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale}}
 | |
| 					<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
 | |
| 					<td class="lines-escape lines-escape-old">{{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></a>{{end}}{{end}}</td>
 | |
| 					<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
 | |
| 					<td class="lines-code lines-code-old halfwidth">{{/*
 | |
| 						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2))}}{{/*
 | |
| 							*/}}<a class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/*
 | |
| 								*/}}{{svg "octicon-plus"}}{{/*
 | |
| 							*/}}</a>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 						*/}}{{if $line.LeftIdx}}{{/*
 | |
| 							*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | |
| 						*/}}{{else}}{{/*
 | |
| 						*/}}<code class="code-inner"></code>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 					*/}}</td>
 | |
| 					<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$file.NameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
 | |
| 					<td class="lines-escape lines-escape-new">{{if $line.RightIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></a>{{end}}{{end}}</td>
 | |
| 					<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
 | |
| 					<td class="lines-code lines-code-new halfwidth">{{/*
 | |
| 						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 3))}}{{/*
 | |
| 							*/}}<a class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">{{/*
 | |
| 								*/}}{{svg "octicon-plus"}}{{/*
 | |
| 							*/}}</a>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 						*/}}{{if $line.RightIdx}}{{/*
 | |
| 							*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | |
| 						*/}}{{else}}{{/*
 | |
| 						*/}}<code class="code-inner"></code>{{/*
 | |
| 						*/}}{{end}}{{/*
 | |
| 					*/}}</td>
 | |
| 				{{end}}
 | |
| 			</tr>
 | |
| 			{{if and (eq .GetType 3) $hasmatch}}
 | |
| 				{{$match := index $section.Lines $line.Match}}
 | |
| 				{{if or (gt (len $line.Comments) 0) (gt (len $match.Comments) 0)}}
 | |
| 					<tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}">
 | |
| 						<td class="lines-num"></td>
 | |
| 						<td class="lines-escape"></td>
 | |
| 						<td class="lines-type-marker"></td>
 | |
| 						<td class="add-comment-left" colspan="4">
 | |
| 							{{if gt (len $line.Comments) 0}}
 | |
| 								{{if eq $line.GetCommentSide "previous"}}
 | |
| 									{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
 | |
| 								{{end}}
 | |
| 							{{end}}
 | |
| 							{{if gt (len $match.Comments) 0}}
 | |
| 								{{if eq $match.GetCommentSide "previous"}}
 | |
| 									{{template "repo/diff/conversation" mergeinto $.root "comments" $match.Comments}}
 | |
| 								{{end}}
 | |
| 							{{end}}
 | |
| 						</td>
 | |
| 						<td class="lines-num"></td>
 | |
| 						<td class="lines-escape"></td>
 | |
| 						<td class="lines-type-marker"></td>
 | |
| 						<td class="add-comment-right" colspan="4">
 | |
| 							{{if eq $line.GetCommentSide "proposed"}}
 | |
| 								{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
 | |
| 							{{end}}
 | |
| 							{{if gt (len $match.Comments) 0}}
 | |
| 								{{if eq $match.GetCommentSide "proposed"}}
 | |
| 									{{template "repo/diff/conversation" mergeinto $.root "comments" $match.Comments}}
 | |
| 								{{end}}
 | |
| 							{{end}}
 | |
| 						</td>
 | |
| 					</tr>
 | |
| 				{{end}}
 | |
| 			{{else if gt (len $line.Comments) 0}}
 | |
| 				<tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}">
 | |
| 					<td class="lines-num"></td>
 | |
| 					<td class="lines-escape"></td>
 | |
| 					<td class="lines-type-marker"></td>
 | |
| 					<td class="add-comment-left" colspan="4">
 | |
| 						{{if gt (len $line.Comments) 0}}
 | |
| 							{{if eq $line.GetCommentSide "previous"}}
 | |
| 								{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
 | |
| 							{{end}}
 | |
| 						{{end}}
 | |
| 					</td>
 | |
| 					<td class="lines-num"></td>
 | |
| 					<td class="lines-escape"></td>
 | |
| 					<td class="lines-type-marker"></td>
 | |
| 					<td class="add-comment-right" colspan="4">
 | |
| 						{{if eq $line.GetCommentSide "proposed"}}
 | |
| 							{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
 | |
| 						{{end}}
 | |
| 					</td>
 | |
| 				</tr>
 | |
| 			{{end}}
 | |
| 		{{end}}
 | |
| 	{{end}}
 | |
| {{end}}
 |