Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-20 18:14:37 +0300
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-20 18:14:37 +0300
commit9414bb00c40bb0fe157057dec497bc70df6db11e (patch)
tree643daa59188b08451c8e26915b4f481a21826d5d /app/assets/javascripts/vue_shared
parent190ea021cd1fd89d20c9548a72034a7b941413ca (diff)
parent245d0daddef23427d9b1aa206dbedf5b9cc89b34 (diff)
Merge branch '38451-fe-sprite-icons-vue-component' into 'master'
Update Icons Documentation about Icon Vue Component Closes #38451 See merge request gitlab-org/gitlab-ce!15171
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r--app/assets/javascripts/vue_shared/components/icon.vue7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue
index 2e5f9f1088f..8f116233e72 100644
--- a/app/assets/javascripts/vue_shared/components/icon.vue
+++ b/app/assets/javascripts/vue_shared/components/icon.vue
@@ -6,10 +6,9 @@
Sample configuration:
<icon
- :img-src="userAvatarSrc"
- :img-alt="tooltipText"
- :tooltip-text="tooltipText"
- tooltip-placement="top"
+ name="retry"
+ :size="32"
+ css-classes="top"
/>
*/