Merge branch '751' into 'master'

Rename inherit color to reset See merge request gitlab-org/gitlab!31363

Merge branch '751' into 'master'
Rename inherit color to reset See merge request gitlab-org/gitlab!31363
d26dd793 · Denys Mishunov · 175e35a8 · 50e0492e · d26dd793
Commit d26dd793 authored May 12, 2020 by Denys Mishunov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/vue_shared/components/gl_mentions.vue app/assets/javascripts/vue_shared/components/gl_mentions.vue +1 -1

No files found.
--- a/app/assets/javascripts/vue_shared/components/gl_mentions.vue
+++ b/app/assets/javascripts/vue_shared/components/gl_mentions.vue
@@ -34,7 +34,7 @@ function createMenuItemTemplate({ original }) {

  return `${avatarTag}
    ${original.username}
-    <small class="small font-weight-normal gl-color-inherit">${name}${count}</small>
+    <small class="small font-weight-normal gl-reset-color">${name}${count}</small>
    ${icon}`;
 }