diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-06-13 16:50:55 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-06-13 17:37:50 -0700 |
| commit | a54077b79d1d3d48fedac59028380b97ec383339 (patch) | |
| tree | ae3d3ab08de430adee08343b7bb7302ae47bb898 | |
| parent | 69966fcb8d19f0ce219a498efb2855902a2895b1 (diff) | |
| download | gitlab-ce-47850-placeholder-note-renders-the-user-name-in-a-new-line.tar.gz | |
Use inline block for note header placeholder info47850-placeholder-note-renders-the-user-name-in-a-new-line
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index b2c1a26bbae..7204f43cd64 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -1675,7 +1675,7 @@ export default class Notes { <div class="note-header"> <div class="note-header-info"> <a href="/${_.escape(currentUsername)}"> - <span class="d-none d-sm-block">${_.escape( + <span class="d-none d-sm-inline-block">${_.escape( currentUsername, )}</span> <span class="note-headline-light">${_.escape( diff --git a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue index eccba61a8c0..38115f268bb 100644 --- a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue +++ b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue @@ -54,7 +54,7 @@ <div class="note-header"> <div class="note-header-info"> <a :href="getUserData.path"> - <span class="d-none d-sm-block">{{ getUserData.name }}</span> + <span class="d-none d-sm-inline-block">{{ getUserData.name }}</span> <span class="note-headline-light">@{{ getUserData.username }}</span> </a> </div> |