Improve code comment review on mobile (#21461)
- 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>
This commit is contained in:
parent
06a7ed4e04
commit
29c00eb1ed
7 changed files with 44 additions and 17 deletions
|
@ -26,7 +26,7 @@
|
||||||
{{template "repo/diff/comments" dict "root" $ "comments" .comments}}
|
{{template "repo/diff/comments" dict "root" $ "comments" .comments}}
|
||||||
</ui>
|
</ui>
|
||||||
</div>
|
</div>
|
||||||
<div class="df je ac fw mt-3">
|
<div class="df je js-small ac fw mt-3">
|
||||||
<div class="ui buttons mr-2">
|
<div class="ui buttons mr-2">
|
||||||
<button class="ui icon tiny basic button previous-conversation">
|
<button class="ui icon tiny basic button previous-conversation">
|
||||||
{{svg "octicon-arrow-up" 12 "icon"}} {{$.locale.Tr "repo.issues.previous"}}
|
{{svg "octicon-arrow-up" 12 "icon"}} {{$.locale.Tr "repo.issues.previous"}}
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-escape"></td>
|
<td class="lines-escape"></td>
|
||||||
<td class="lines-type-marker"></td>
|
<td class="lines-type-marker"></td>
|
||||||
<td class="add-comment-left">
|
<td class="add-comment-left" colspan="4">
|
||||||
{{if gt (len $line.Comments) 0}}
|
{{if gt (len $line.Comments) 0}}
|
||||||
{{if eq $line.GetCommentSide "previous"}}
|
{{if eq $line.GetCommentSide "previous"}}
|
||||||
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
||||||
|
@ -116,7 +116,7 @@
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-escape"></td>
|
<td class="lines-escape"></td>
|
||||||
<td class="lines-type-marker"></td>
|
<td class="lines-type-marker"></td>
|
||||||
<td class="add-comment-right">
|
<td class="add-comment-right" colspan="4">
|
||||||
{{if eq $line.GetCommentSide "proposed"}}
|
{{if eq $line.GetCommentSide "proposed"}}
|
||||||
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
@ -133,7 +133,7 @@
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-escape"></td>
|
<td class="lines-escape"></td>
|
||||||
<td class="lines-type-marker"></td>
|
<td class="lines-type-marker"></td>
|
||||||
<td class="add-comment-left">
|
<td class="add-comment-left" colspan="4">
|
||||||
{{if gt (len $line.Comments) 0}}
|
{{if gt (len $line.Comments) 0}}
|
||||||
{{if eq $line.GetCommentSide "previous"}}
|
{{if eq $line.GetCommentSide "previous"}}
|
||||||
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
||||||
|
@ -143,7 +143,7 @@
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-escape"></td>
|
<td class="lines-escape"></td>
|
||||||
<td class="lines-type-marker"></td>
|
<td class="lines-type-marker"></td>
|
||||||
<td class="add-comment-right">
|
<td class="add-comment-right" colspan="4">
|
||||||
{{if eq $line.GetCommentSide "proposed"}}
|
{{if eq $line.GetCommentSide "proposed"}}
|
||||||
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
{{if gt (len $line.Comments) 0}}
|
{{if gt (len $line.Comments) 0}}
|
||||||
<tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}">
|
<tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}">
|
||||||
<td colspan="3" class="lines-num"></td>
|
<td colspan="3" class="lines-num"></td>
|
||||||
<td class="add-comment-left add-comment-right" colspan="2">
|
<td class="add-comment-left add-comment-right" colspan="5">
|
||||||
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
{{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -513,16 +513,16 @@ export function initRepoPullRequestReview() {
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-escape"></td>
|
<td class="lines-escape"></td>
|
||||||
<td class="lines-type-marker"></td>
|
<td class="lines-type-marker"></td>
|
||||||
<td class="add-comment-left"></td>
|
<td class="add-comment-left" colspan="4"></td>
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-escape"></td>
|
<td class="lines-escape"></td>
|
||||||
<td class="lines-type-marker"></td>
|
<td class="lines-type-marker"></td>
|
||||||
<td class="add-comment-right"></td>
|
<td class="add-comment-right" colspan="4"></td>
|
||||||
` : `
|
` : `
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-num"></td>
|
<td class="lines-num"></td>
|
||||||
<td class="lines-escape"></td>
|
<td class="lines-escape"></td>
|
||||||
<td class="add-comment-left add-comment-right" colspan="2"></td>
|
<td class="add-comment-left add-comment-right" colspan="5"></td>
|
||||||
`}
|
`}
|
||||||
</tr>`);
|
</tr>`);
|
||||||
tr.after(ntr);
|
tr.after(ntr);
|
||||||
|
|
|
@ -1126,7 +1126,10 @@
|
||||||
.comment-content {
|
.comment-content {
|
||||||
margin-left: 36px;
|
margin-left: 36px;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.code-comment,
|
||||||
|
.comment {
|
||||||
img.avatar {
|
img.avatar {
|
||||||
width: 28px;
|
width: 28px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
|
@ -3266,7 +3269,8 @@ td.blob-excerpt {
|
||||||
background: var(--color-diff-inactive);
|
background: var(--color-diff-inactive);
|
||||||
}
|
}
|
||||||
|
|
||||||
.code-diff-split tbody tr td:nth-child(5) {
|
.code-diff-split tbody tr td:nth-child(5),
|
||||||
|
.code-diff-split tbody tr td.add-comment-right {
|
||||||
border-left: 1px solid var(--color-secondary);
|
border-left: 1px solid var(--color-secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,12 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.add-comment .lines-num,
|
||||||
|
.add-comment .lines-escape,
|
||||||
|
.add-comment .lines-type-marker {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.show-outdated,
|
.show-outdated,
|
||||||
.hide-outdated {
|
.hide-outdated {
|
||||||
&:extend(.unselectable);
|
&:extend(.unselectable);
|
||||||
|
@ -59,11 +65,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-code-cloud {
|
.comment-code-cloud {
|
||||||
padding: .5rem !important;
|
padding: .5rem 1rem !important;
|
||||||
position: relative;
|
position: relative;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
max-width: 1000px;
|
||||||
|
|
||||||
@media @mediaSm {
|
@media @mediaSm {
|
||||||
|
max-width: auto;
|
||||||
padding: .75rem !important;
|
padding: .75rem !important;
|
||||||
|
|
||||||
.code-comment-buttons {
|
.code-comment-buttons {
|
||||||
|
@ -73,13 +81,22 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ui.buttons {
|
||||||
|
width: 100%;
|
||||||
|
margin: 0 !important;
|
||||||
|
|
||||||
|
.button {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.comments .comment {
|
.comments .comment {
|
||||||
margin: 0;
|
padding: 0;
|
||||||
|
|
||||||
@media @mediaSm {
|
@media @mediaSm {
|
||||||
padding: 0;
|
display: flex;
|
||||||
|
|
||||||
.comment-header-right.actions .ui.basic.label {
|
.comment-header-right.actions .ui.basic.label {
|
||||||
display: none;
|
display: none;
|
||||||
|
@ -90,6 +107,10 @@
|
||||||
float: none;
|
float: none;
|
||||||
margin: 0 .5rem 0 0;
|
margin: 0 .5rem 0 0;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
|
||||||
|
~ .content {
|
||||||
|
margin-left: 1em;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
img.avatar {
|
img.avatar {
|
||||||
|
@ -100,6 +121,10 @@
|
||||||
margin-left: 0 !important;
|
margin-left: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.comment-container {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
&.code-comment {
|
&.code-comment {
|
||||||
padding: 0 0 .5rem !important;
|
padding: 0 0 .5rem !important;
|
||||||
}
|
}
|
||||||
|
@ -166,12 +191,9 @@
|
||||||
.button {
|
.button {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
|
|
||||||
&:not(:last-child) {
|
|
||||||
margin-bottom: .75rem !important;
|
margin-bottom: .75rem !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.diff-file-body .comment-form {
|
.diff-file-body .comment-form {
|
||||||
|
|
|
@ -175,4 +175,5 @@
|
||||||
@media @mediaSm {
|
@media @mediaSm {
|
||||||
.db-small { display: block !important; }
|
.db-small { display: block !important; }
|
||||||
.w-100-small { width: 100% !important; }
|
.w-100-small { width: 100% !important; }
|
||||||
|
.js-small { justify-content: flex-start !important; }
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue