diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 18:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 18:09:26 +0300 |
| commit | 991c66333dc7bdb0fd6f7a0b7f7bdf8383285975 (patch) | |
| tree | 40a03fe2fc2cc087a93a3d36086c0b3092be3a44 /app/assets/javascripts/vue_shared/components/markdown | |
| parent | 24f32a55ee1f8dc2dc36e04898886459b1393c2f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue | 10 |
1 files changed, 5 insertions, 5 deletions
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 8a1b8363f19..7646a8718d6 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 @@ -139,8 +139,8 @@ export default { </script> <template> - <div class="md-suggestion-header border-bottom-0 mt-2"> - <div class="js-suggestion-diff-header font-weight-bold"> + <div class="md-suggestion-header border-bottom-0 gl-mt-3"> + <div class="js-suggestion-diff-header gl-font-weight-bold"> {{ __('Suggested change') }} <a v-if="helpPagePath" :href="helpPagePath" :aria-label="__('Help')" class="js-help-btn"> <gl-icon name="question-o" css-classes="link-highlight" /> @@ -151,13 +151,13 @@ export default { </gl-badge> <div v-else-if="isApplying" - class="d-flex align-items-center text-secondary" + class="gl-display-flex gl-align-items-center text-secondary" data-qa-selector="applying_badge" > - <gl-loading-icon size="sm" class="d-flex-center mr-2" /> + <gl-loading-icon size="sm" class="gl-align-items-center gl-justify-content-center gl-mr-3" /> <span>{{ applyingSuggestionsMessage }}</span> </div> - <div v-else-if="isLoggedIn" class="d-flex align-items-center"> + <div v-else-if="isLoggedIn" class="gl-display-flex gl-align-items-center"> <div v-if="isBatched"> <gl-button class="btn-inverted js-remove-from-batch-btn btn-grouped" |