Skip to content

Commit d0f4818

Browse files
authored
1 parent 8e45fcb commit d0f4818

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

templates/repo/diff/box.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{{svg "octicon-diff" 16 "gt-mr-2"}}{{.locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
2525
</div>
2626
</div>
27-
<div class="diff-detail-actions gt-df gt-ac gt-w-100">
27+
<div class="diff-detail-actions gt-df gt-ac">
2828
{{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}}
2929
<progress id="viewed-files-summary" class="gt-mr-2" value="{{.Diff.NumViewedFiles}}" max="{{.Diff.NumFiles}}"></progress>
3030
<label for="viewed-files-summary" id="viewed-files-summary-label" class="gt-mr-3 gt-f1" data-text-changed-template="{{.locale.Tr "repo.pulls.viewed_files_label"}}">

templates/repo/diff/new_review.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span class="ui small label review-comments-counter" data-pending-comment-number="{{.PendingCodeCommentNumber}}">{{.PendingCodeCommentNumber}}</span>
55
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
66
</button>
7-
<div class="review-box-panel gt-hidden">
7+
<div class="review-box-panel tippy-target">
88
<div class="ui segment">
99
<form class="ui form" action="{{.Link}}/reviews/submit" method="post">
1010
{{.CsrfTokenHtml}}

web_src/css/review.css

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,10 @@ a.blob-excerpt:hover {
214214
color: var(--color-primary-contrast);
215215
}
216216

217+
.review-box-panel .ui.segment {
218+
border: none;
219+
}
220+
217221
/* See the comment of createCommentEasyMDE() for the review editor */
218222
/* EasyMDE's options can not handle minHeight & maxHeight together correctly, we have to set minHeight in JS code */
219223
.review-box-panel .CodeMirror-scroll {
@@ -249,14 +253,6 @@ a.blob-excerpt:hover {
249253
position: relative;
250254
}
251255

252-
.review-box-panel {
253-
position: absolute;
254-
min-width: max-content;
255-
top: 45px;
256-
right: -5px;
257-
z-index: 2;
258-
}
259-
260256
#review-box .review-comments-counter {
261257
background-color: var(--color-primary-light-4);
262258
color: var(--color-primary-contrast);

web_src/js/features/repo-issue.js

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {attachTribute} from './tribute.js';
44
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
55
import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
66
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
7-
import {initTooltip, showTemporaryTooltip} from '../modules/tippy.js';
7+
import {initTooltip, showTemporaryTooltip, createTippy} from '../modules/tippy.js';
88
import {hideElem, showElem, toggleElem} from '../utils/dom.js';
99
import {setFileFolding} from './file-fold.js';
1010

@@ -512,12 +512,23 @@ export function initRepoPullRequestReview() {
512512
return;
513513
}
514514

515-
$('.js-btn-review').on('click', function (e) {
516-
e.preventDefault();
517-
toggleElem($(this).parent().find('.review-box-panel'));
518-
}).parent().find('.review-box-panel .close').on('click', function (e) {
515+
const $reviewBtn = $('.js-btn-review');
516+
const $panel = $reviewBtn.parent().find('.review-box-panel');
517+
const $closeBtn = $panel.find('.close');
518+
519+
const tippy = createTippy($reviewBtn[0], {
520+
content: $panel[0],
521+
placement: 'bottom',
522+
trigger: 'click',
523+
role: 'menu',
524+
maxWidth: 'none',
525+
interactive: true,
526+
hideOnClick: true,
527+
});
528+
529+
$closeBtn.on('click', (e) => {
519530
e.preventDefault();
520-
hideElem($(this).closest('.review-box-panel'));
531+
tippy.hide();
521532
});
522533

523534
$(document).on('click', 'a.add-code-comment', async function (e) {

0 commit comments

Comments
 (0)