diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-25 18:08:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-25 18:08:05 +0300 |
| commit | 4dc41ac252c0bfefb9bc55a8627262cc76c69d5e (patch) | |
| tree | 24bd114dee0235c3874d83d57d64abab87b39a3c /app/assets/javascripts/notes | |
| parent | ba9892d3c122a4f437b4b38926fb75848deaf097 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index e2b0c7fee32..ec2095c91f2 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -107,7 +107,7 @@ export default { <td v-if="error" class="js-error-lazy-load-diff diff-loading-error-block"> {{ __('Unable to load the diff') }} <button - class="btn-link btn-link-retry gl-p-0 js-toggle-lazy-diff-retry-button" + class="gl-button btn-link btn-link-retry gl-p-0 js-toggle-lazy-diff-retry-button gl-reset-font-size!" @click="fetchDiff" > {{ __('Try again') }} diff --git a/app/assets/javascripts/notes/components/email_participants_warning.vue b/app/assets/javascripts/notes/components/email_participants_warning.vue index ecf42fce1d2..1875d48e7b2 100644 --- a/app/assets/javascripts/notes/components/email_participants_warning.vue +++ b/app/assets/javascripts/notes/components/email_participants_warning.vue @@ -58,7 +58,7 @@ export default { <div class="issuable-note-warning" data-testid="email-participants-warning"> <gl-sprintf :message="message"> <template #andMore> - <button type="button" class="btn-transparent btn-link" @click="showMoreParticipants"> + <button type="button" class="gl-button btn-link" @click="showMoreParticipants"> {{ moreLabel }} </button> </template> diff --git a/app/assets/javascripts/notes/components/toggle_replies_widget.vue b/app/assets/javascripts/notes/components/toggle_replies_widget.vue index 65b3fd6f8b3..8cd4477a3bb 100644 --- a/app/assets/javascripts/notes/components/toggle_replies_widget.vue +++ b/app/assets/javascripts/notes/components/toggle_replies_widget.vue @@ -72,7 +72,7 @@ export default { {{ replies.length }} {{ n__('reply', 'replies', replies.length) }} </gl-button> {{ __('Last reply by') }} - <a :href="lastReply.author.path" class="btn btn-link author-link gl-mx-2"> + <a :href="lastReply.author.path" class="btn btn-link author-link gl-mx-2 gl-button"> {{ lastReply.author.name }} </a> <time-ago-tooltip :time="lastReply.created_at" tooltip-placement="bottom" /> |