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

Merge branch 'ide-mr-icon-fixes' into 'master'
b026cf78 · Filipa Lacerda · c0aede3e · b026cf78
Commit b026cf78 authored May 08, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mr_file_icon.vue app/assets/javascripts/ide/components/mr_file_icon.vue +2 -2

No files found.
--- 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')"
+    :title="__('Part of merge request changes')"
-    css-classes="ide-file-changed-icon"
+    css-classes="append-right-8"
    :size="12"
  />
 </template>