diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-31 09:02:48 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-31 09:02:48 +0000 |
| commit | 4b2ea22caf5d5a2f72ce5a590f5264cd45c3eb38 (patch) | |
| tree | 7bf1db29cf8e32f31920d4147225daa36b64f417 /app/assets/javascripts/vue_shared/components | |
| parent | 8702dbcda312547dad937f63b88939ade5f0c5df (diff) | |
| parent | b0ba7c72de0a864b01ec1c4be626a8a233a9009f (diff) | |
| download | gitlab-ce-4b2ea22caf5d5a2f72ce5a590f5264cd45c3eb38.tar.gz | |
Merge branch 'mg-update-icons-svg-import' into 'master'
Use file-loader for sprite icons within icon.vue
See merge request gitlab-org/gitlab-ce!31257
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/icon.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue index 41c4c861566..fa89473da62 100644 --- a/app/assets/javascripts/vue_shared/components/icon.vue +++ b/app/assets/javascripts/vue_shared/components/icon.vue @@ -1,4 +1,6 @@ <script> +import iconsPath from '@gitlab/svgs/dist/icons.svg'; + // only allow classes in images.scss e.g. s12 const validSizes = [8, 10, 12, 14, 16, 18, 24, 32, 48, 72]; let iconValidator = () => true; @@ -84,7 +86,7 @@ export default { computed: { spriteHref() { - return `${gon.sprite_icons}#${this.name}`; + return `${iconsPath}#${this.name}`; }, iconTestClass() { return `ic-${this.name}`; |