diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-08 13:16:42 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-09 11:59:58 +0300 |
| commit | b026cf783fc971a1d25660def692e99baec750ce (patch) | |
| tree | 5a0b94cbf0eac5a8e7e9e93efb42c3eddfe5ad77 /app | |
| parent | c0aede3e538048f1fc30b560ab5d9a7a4d04f96c (diff) | |
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
Diffstat (limited to 'app')
| -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> |