diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-08 10:16:42 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-08 10:16:42 +0000 |
| commit | c8bfb3e418b0dcce8b3f3bec91bb2ae64f0fe19d (patch) | |
| tree | 2876824f5d5f0f915a6846e6f4ef6686ea666007 | |
| parent | fcea5fc8f902c6e8c8f4643abd9ed91c67e22228 (diff) | |
| parent | dbe81dda3abf57174ecb9790011ffec4c4d2e7d6 (diff) | |
| download | gitlab-ce-c8bfb3e418b0dcce8b3f3bec91bb2ae64f0fe19d.tar.gz | |
Merge branch 'ide-mr-icon-fixes' into 'master'
Fixed tooltip & spacing of merge request icon in IDE
Closes #46121 and #46123
See merge request gitlab-org/gitlab-ce!18805
| -rw-r--r-- | app/assets/javascripts/ide/components/mr_file_icon.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/mr_file_icon.vue b/app/assets/javascripts/ide/components/mr_file_icon.vue index 8a440902dfc..179a589d1ac 100644 --- a/app/assets/javascripts/ide/components/mr_file_icon.vue +++ b/app/assets/javascripts/ide/components/mr_file_icon.vue @@ -16,8 +16,8 @@ export default { <icon name="git-merge" v-tooltip - title="__('Part of merge request changes')" - css-classes="ide-file-changed-icon" + :title="__('Part of merge request changes')" + css-classes="append-right-8" :size="12" /> </template> |