diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index ca1662313c2..ae6029142fe 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -65,12 +65,7 @@ export default { diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index 0eff922d93c..85a15b38de1 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -155,10 +155,7 @@ export default { @submit.prevent.stop="onSubmit" >
- +

-
- {{ s__('Badges|Please fill in a valid URL') }} -
- - {{ badgeLinkUrlExample }} - +
{{ s__('Badges|Please fill in a valid URL') }}
+ {{ badgeLinkUrlExample }}
- +

-
- {{ s__('Badges|Please fill in a valid URL') }} -
- - {{ badgeImageUrlExample }} - +
{{ s__('Badges|Please fill in a valid URL') }}
+ {{ badgeImageUrlExample }}
@@ -206,37 +192,22 @@ export default { :image-url="renderedImageUrl" :link-url="renderedLinkUrl" /> -

- +

+

+ {{ s__('Badges|No image to preview') }}

-

{{ s__('Badges|No image to preview') }}

-
+
- +
-
+
{{ s__('Badges|Your badges') }} - {{ badges.length }} + {{ badges.length }}
- -
+ +
{{ s__('Badges|This group has no badges') }} {{ s__('Badges|This project has no badges') }}
-
- +
+
diff --git a/app/assets/javascripts/badges/components/badge_list_row.vue b/app/assets/javascripts/badges/components/badge_list_row.vue index d01465232a7..9051be1e102 100644 --- a/app/assets/javascripts/badges/components/badge_list_row.vue +++ b/app/assets/javascripts/badges/components/badge_list_row.vue @@ -50,20 +50,14 @@ export default { {{ badgeKindText }}
diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index cc47e56dd1e..75a522efe7e 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -46,7 +46,8 @@ export default { :header-title-text="s__('Badges|Delete badge?')" :footer-primary-button-text="s__('Badges|Delete badge')" footer-primary-button-variant="danger" - @submit="onSubmitModal"> + @submit="onSubmitModal" + >

- + - +
diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index befa1dc455f..d0359fc5fe9 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -23,10 +23,12 @@ export default class BlobViewer { if (!viewer || !viewer.dataset.richType) return; const initViewer = promise => - promise.then(module => module.default(viewer)).catch(error => { - Flash('Error loading file viewer.'); - throw error; - }); + promise + .then(module => module.default(viewer)) + .catch(error => { + Flash('Error loading file viewer.'); + throw error; + }); switch (viewer.dataset.richType) { case 'balsamiq': diff --git a/app/assets/javascripts/boards/components/board_blank_state.vue b/app/assets/javascripts/boards/components/board_blank_state.vue index 561a4636ef5..667eea17d44 100644 --- a/app/assets/javascripts/boards/components/board_blank_state.vue +++ b/app/assets/javascripts/boards/components/board_blank_state.vue @@ -61,35 +61,25 @@ export default {