diff --git a/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_add_note.vue b/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_add_note.vue index 3c709fc565fd31cc4484c26a5abf876570badabe..68cd6fc706e0988f56be41ea9a553dd6b53ea83d 100644 --- a/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_add_note.vue +++ b/app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_add_note.vue @@ -8,7 +8,7 @@ import AbuseReportCommentForm from './abuse_report_comment_form.vue'; export default { name: 'AbuseReportAddNote', i18n: { - reply: __('Reply'), + reply: __('Reply…'), replyToComment: __('Reply to comment'), commentError: __('Your comment could not be submitted because %{reason}.'), genericError: __( @@ -124,7 +124,7 @@ export default { v-else ref="textarea" rows="1" - class="reply-placeholder-text-field gl-font-regular!" + class="reply-placeholder-text-field" data-testid="abuse-report-note-reply-textarea" :placeholder="$options.i18n.reply" :aria-label="$options.i18n.replyToComment" diff --git a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue index c3b7b7a2953f6f9d260ce5636578b0487317540f..3636f222c2df4c954af1f4f2ee403b16df02891b 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue @@ -287,9 +287,9 @@ export default { v-else ref="textarea" rows="1" - class="reply-placeholder-text-field gl-font-regular!" + class="reply-placeholder-text-field" data-testid="note-reply-textarea" - :placeholder="__('Reply')" + :placeholder="__('Reply…')" :aria-label="__('Reply to comment')" @focus="showReplyForm" @click="showReplyForm" diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index e5808c71a6d69dd7eedc816aaad944dbd565bee2..5d644d636660addd6e97cce119caf57e01b087fa 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -326,7 +326,6 @@ table { .discussion-reply-holder { .reply-placeholder-text-field { - @include gl-font-monospace; border-radius: $gl-border-radius-base; width: 100%; resize: none; diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index aad3e07ea2835e03762a1b7f4dee2c5b83d1d191..e67e6c22e1ae933b530bbe58a8ed2143c3eb73bb 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -65,7 +65,7 @@ def link_to_reply_discussion(discussion, line_type = nil) content_tag( :textarea, rows: 1, - placeholder: _('Reply...'), + placeholder: _('Reply…'), 'aria-label': _('Reply to comment'), class: 'reply-placeholder-text-field js-discussion-reply-button', data: { diff --git a/ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue b/ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue index 7c84d82e115514086894aa760402a8356ccf4473..d075ed78492164c5c53ff48d3a39254e139e2f73 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue @@ -228,7 +228,7 @@ export default { <textarea rows="1" :placeholder="s__('vulnerability|Add a comment')" - class="reply-placeholder-text-field gl-font-regular!" + class="reply-placeholder-text-field" data-testid="add-comment-textarea" @focus="showCommentInput" ></textarea> diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 6ad032d15b15a03f639691991e2df855a605e5aa..c563e837d504fcbfb8a3fe76367e3d70a9acd4af 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -40218,9 +40218,6 @@ msgstr "" msgid "Reply to this email directly or %{view_it_on_gitlab}." msgstr "" -msgid "Reply..." -msgstr "" - msgid "Reply…" msgstr "" diff --git a/spec/frontend/admin/abuse_report/components/notes/abuse_report_add_note_spec.js b/spec/frontend/admin/abuse_report/components/notes/abuse_report_add_note_spec.js index dd9dcf304ae9afb3e1bb7e8632d0e796fcf934bb..f9d8ad93834f2df82097d4a3481dbaa53f40344c 100644 --- a/spec/frontend/admin/abuse_report/components/notes/abuse_report_add_note_spec.js +++ b/spec/frontend/admin/abuse_report/components/notes/abuse_report_add_note_spec.js @@ -115,7 +115,7 @@ describe('Abuse Report Add Note', () => { expect(findReplyTextarea().exists()).toBe(true); expect(findReplyTextarea().attributes()).toMatchObject({ rows: '1', - placeholder: 'Reply', + placeholder: 'Reply…', 'aria-label': 'Reply to comment', }); });