diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 18:08:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 18:08:16 +0300 |
| commit | 711f8595324430e216ba62f874e7db9fdf482f73 (patch) | |
| tree | da5b8063c16a20e2ab414ca20526ef64817b4393 /app/assets/javascripts/badges | |
| parent | 65f197cdb6f7732e6c56433483a17f50d98b48f0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/badges')
| -rw-r--r-- | app/assets/javascripts/badges/components/badge.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/badges/components/badge_list_row.vue | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index 6edbdc7090c..3242993b06a 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -84,10 +84,10 @@ export default { <div v-show="hasError" class="btn-group"> <div class="btn btn-default btn-sm disabled"> - <icon :size="16" class="gl-ml-3 append-right-8" name="doc-image" aria-hidden="true" /> + <icon :size="16" class="gl-ml-3 gl-mr-3" name="doc-image" aria-hidden="true" /> </div> <div class="btn btn-default btn-sm disabled"> - <span class="gl-ml-3 append-right-8">{{ s__('Badges|No badge image') }}</span> + <span class="gl-ml-3 gl-mr-3">{{ s__('Badges|No badge image') }}</span> </div> </div> diff --git a/app/assets/javascripts/badges/components/badge_list_row.vue b/app/assets/javascripts/badges/components/badge_list_row.vue index bb363b8d85e..bad14666bb2 100644 --- a/app/assets/javascripts/badges/components/badge_list_row.vue +++ b/app/assets/javascripts/badges/components/badge_list_row.vue @@ -54,7 +54,7 @@ export default { <div v-if="canEditBadge" class="table-action-buttons"> <button :disabled="badge.isDeleting" - class="btn btn-default append-right-8" + class="btn btn-default gl-mr-3" type="button" @click="editBadge(badge)" > |