Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the height of the editor in Review Box smaller (4 lines as GitHub) #18319

Merged
merged 9 commits into from
Jan 18, 2022
Merged

Make the height of the editor in Review Box smaller (4 lines as GitHub) #18319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c14b63
Make the height of the editor in Review Box smaller (4 lines as GitHub)
wxiaoguang Jan 18, 2022
e09d10a
tune UI
wxiaoguang Jan 18, 2022
c4410d9
use {...obj}
wxiaoguang Jan 18, 2022
1ab708a
tune UI
wxiaoguang Jan 18, 2022
aeffd56
tune UI
wxiaoguang Jan 18, 2022
819e9da
tune UI
wxiaoguang Jan 18, 2022
b834c2c
Merge branch 'main' into fix-reviewbox-height
wxiaoguang Jan 18, 2022
24003a9
Merge branch 'main' into fix-reviewbox-height
wxiaoguang Jan 18, 2022
85143e4
Merge branch 'main' into fix-reviewbox-height
zeripath Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions web_src/js/features/comp/EasyMDE.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ export async function importEasyMDE() {
/**
* create an EasyMDE editor for comment
* @param textarea jQuery or HTMLElement
* @param easyMDEOptions the options for EasyMDE
* @returns {null|EasyMDE}
*/
export async function createCommentEasyMDE(textarea) {
export async function createCommentEasyMDE(textarea, easyMDEOptions = {}) {
if (textarea instanceof jQuery) {
textarea = textarea[0];
}
Expand All @@ -61,6 +62,7 @@ export async function createCommentEasyMDE(textarea) {
}

const EasyMDE = await importEasyMDE();

const easyMDE = new EasyMDE({
autoDownloadFontAwesome: false,
element: textarea,
Expand Down Expand Up @@ -104,8 +106,7 @@ export async function createCommentEasyMDE(textarea) {
className: 'fa fa-file',
title: 'Revert to simple textarea',
},
],
});
], ...easyMDEOptions});
const inputField = easyMDE.codemirror.getInputField();
inputField.classList.add('js-quick-submit');
easyMDE.codemirror.setOption('extraKeys', {
Expand Down
4 changes: 3 additions & 1 deletion web_src/js/features/repo-issue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,9 @@ export function initRepoPullRequestReview() {
const $reviewBox = $('.review-box');
if ($reviewBox.length === 1) {
(async () => {
await createCommentEasyMDE($reviewBox.find('textarea'));
// the editor's height is too large in some cases, and the panel cannot be scrolled with page now because there is `.repository .diff-detail-box.sticky { position: sticky; }`
// the temporary solution is to make the editor's height smaller (about 4 lines). GitHub also only show 4 lines for default. We can improve the UI (including Dropzone area) in future
await createCommentEasyMDE($reviewBox.find('textarea'), {minHeight: '80px'});
initCompImagePaste($reviewBox);
})();
}
Expand Down
20 changes: 13 additions & 7 deletions web_src/less/features/dropzone.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
.dropzone {
border: 2px dashed var(--color-secondary) !important;
background: none !important;
box-shadow: none !important;
padding: 0 !important;
min-height: 5rem !important;
border-radius: 4px !important;
.ui .field {
.dropzone {
border: 2px dashed var(--color-secondary);
background: none;
box-shadow: none;
padding: 0;
border-radius: 4px;
min-height: 0;
margin-top: -1em; // we have another `field` above, it's usually an EasyMDE editor with "status bar", so we do not need the space above.
.dz-message {
margin: 10px 0;
}
}
}

.dropzone .dz-button {
Expand Down