diff options
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown')
3 files changed, 39 insertions, 18 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index 65116ed8ca3..9cfba85e0d8 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -141,10 +141,9 @@ export default { addMultipleToDiscussionWarning() { return sprintf( __( - '%{icon}You are about to add %{usersTag} people to the discussion. They will all receive a notification.', + 'You are about to add %{usersTag} people to the discussion. They will all receive a notification.', ), { - icon: '<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>', usersTag: `<strong><span class="js-referenced-users-count">${this.referencedUsers.length}</span></strong>`, }, false, @@ -175,9 +174,10 @@ export default { issues: this.enableAutocomplete && !this.glFeatures.tributeAutocomplete, mergeRequests: this.enableAutocomplete && !this.glFeatures.tributeAutocomplete, epics: this.enableAutocomplete, - milestones: this.enableAutocomplete, + milestones: this.enableAutocomplete && !this.glFeatures.tributeAutocomplete, labels: this.enableAutocomplete && !this.glFeatures.tributeAutocomplete, - snippets: this.enableAutocomplete, + snippets: this.enableAutocomplete && !this.glFeatures.tributeAutocomplete, + vulnerabilities: this.enableAutocomplete, }, true, ); @@ -293,6 +293,7 @@ export default { <template v-if="previewMarkdown && !markdownPreviewLoading"> <div v-if="referencedCommands" class="referenced-commands" v-html="referencedCommands"></div> <div v-if="shouldShowReferencedUsers" class="referenced-users"> + <gl-icon name="warning-solid" /> <span v-html="addMultipleToDiscussionWarning"></span> </div> </template> diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue index fb9636ba734..fb51840b689 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue @@ -72,6 +72,9 @@ export default { } return __('Applying suggestions...'); }, + isLoggedIn() { + return Boolean(gon.current_user_id); + }, }, methods: { applySuggestion() { @@ -141,6 +144,7 @@ export default { </gl-button> <span v-gl-tooltip.viewport="tooltipMessage" tabindex="0"> <gl-button + v-if="isLoggedIn" class="btn-inverted js-apply-btn btn-grouped" :disabled="isDisableButton" variant="success" diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue index 5d47aed9643..5824cb9438f 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue @@ -61,43 +61,59 @@ export default { <span v-if="canAttachFile" class="uploading-container"> <span class="uploading-progress-container hide"> <template> - <gl-icon name="media" :size="16" class="gl-vertical-align-text-bottom" /> + <gl-icon name="media" /> </template> <span class="attaching-file-message"></span> <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings --> <span class="uploading-progress">0%</span> - <gl-loading-icon inline class="align-text-bottom" /> + <gl-loading-icon inline /> </span> <span class="uploading-error-container hide"> <span class="uploading-error-icon"> - <template> - <gl-icon name="media" :size="16" class="gl-vertical-align-text-bottom" /> - </template> + <gl-icon name="media" /> </span> <span class="uploading-error-message"></span> <gl-sprintf :message=" __( - '%{retryButtonStart}Try again%{retryButtonEnd} or %{newFileButtonStart}attach a new file%{newFileButtonEnd}', + '%{retryButtonStart}Try again%{retryButtonEnd} or %{newFileButtonStart}attach a new file%{newFileButtonEnd}.', ) " > <template #retryButton="{content}"> - <button class="retry-uploading-link" type="button">{{ content }}</button> + <gl-button + variant="link" + category="primary" + class="retry-uploading-link gl-vertical-align-baseline" + > + {{ content }} + </gl-button> </template> <template #newFileButton="{content}"> - <button class="attach-new-file markdown-selector" type="button">{{ content }}</button> + <gl-button + variant="link" + category="primary" + class="markdown-selector attach-new-file gl-vertical-align-baseline" + > + {{ content }} + </gl-button> </template> </gl-sprintf> </span> - <gl-button class="markdown-selector button-attach-file" variant="link"> - <template> - <gl-icon name="media" :size="16" /> - </template> - <span class="text-attach-file">{{ __('Attach a file') }}</span> + <gl-button + icon="media" + variant="link" + category="primary" + class="markdown-selector button-attach-file gl-vertical-align-text-bottom" + > + {{ __('Attach a file') }} </gl-button> - <gl-button class="btn btn-default btn-sm hide button-cancel-uploading-files" variant="link"> + <gl-button + variant="link" + category="primary" + class="button-cancel-uploading-files gl-vertical-align-baseline hide" + > {{ __('Cancel') }} </gl-button> </span> |