diff options
| author | silverwind <me@silverwind.io> | 2021-04-01 00:19:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 18:19:53 -0400 |
| commit | aee5ef00519cd199992bb7dc02b4fa22a392869e (patch) | |
| tree | d578e2b5735257bef4c40da37692b9c81ae331ec /templates/repo/diff | |
| parent | 8d9f191195eaafd6b697683cd5f8c89c3f6e7cf6 (diff) | |
| download | gitea-aee5ef00519cd199992bb7dc02b4fa22a392869e.tar.gz gitea-aee5ef00519cd199992bb7dc02b4fa22a392869e.zip | |
Diff box fixes (#15214)
- Fix misaligned "Show Outdated" buttons via flexbox
- Add hover effect to "Show Outdated" buttons
- Remove overreaching margin from selector .diff-file-box and handle
cases individually.
Fixes: https://github.com/go-gitea/gitea/issues/15097
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'templates/repo/diff')
| -rw-r--r-- | templates/repo/diff/box.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/diff/conversation.tmpl | 26 |
2 files changed, 18 insertions, 14 deletions
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 368fc2c444..2dcad2ba9d 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -43,7 +43,7 @@ </ol> {{range $i, $file := .Diff.Files}} {{if $file.IsIncomplete}} - <div class="diff-file-box diff-box file-content"> + <div class="diff-file-box diff-box file-content mt-3"> <h4 class="ui top attached normal header rounded"> <a role="button" class="fold-file muted mr-2"> {{svg "octicon-chevron-down" 18}} @@ -70,7 +70,7 @@ </h4> </div> {{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}} mt-3" id="diff-{{.Index}}"> <h4 class="diff-file-header sticky-2nd-row ui top attached normal header df ac sb"> <div class="df ac"> {{$isImage := false}} @@ -145,7 +145,7 @@ {{end}} {{if .Diff.IsIncomplete}} - <div class="diff-file-box diff-box file-content"> + <div class="diff-file-box diff-box file-content mt-3"> <h4 class="ui top attached normal header"> {{$.i18n.Tr "repo.diff.too_many_files"}} </h4> diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index 4dd7de0fc1..7b447d01bf 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -3,16 +3,20 @@ {{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}} <div class="conversation-holder" data-path="{{(index .comments 0).TreePath}}" data-side="{{if lt (index .comments 0).Line 0}}left{{else}}right{{end}}" data-idx="{{(index .comments 0).UnsignedLine}}"> {{if $resolved}} - <div class="ui attached header resolved-placeholder"> - <span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}</span> - <button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny right labeled button show-outdated"> - {{svg "octicon-unfold"}} - {{$.i18n.Tr "repo.issues.review.show_resolved"}} - </button> - <button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="hide ui tiny right labeled button hide-outdated"> - {{svg "octicon-fold"}} - {{$.i18n.Tr "repo.issues.review.hide_resolved"}} - </button> + <div class="ui attached header resolved-placeholder df ac sb"> + <div class="ui grey text"> + <b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}} + </div> + <div> + <button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny right labeled button show-outdated df ac"> + {{svg "octicon-unfold" 16 "mr-3"}} + {{$.i18n.Tr "repo.issues.review.show_resolved"}} + </button> + <button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="hide ui tiny right labeled button hide-outdated df ac"> + {{svg "octicon-fold" 16 "mr-3"}} + {{$.i18n.Tr "repo.issues.review.hide_resolved"}} + </button> + </div> </div> {{end}} <div id="code-comments-{{(index .comments 0).ID}}" class="field comment-code-cloud {{if $resolved}}hide{{end}}"> @@ -32,4 +36,4 @@ </button> {{end}} </div> -</div>
\ No newline at end of file +</div> |