diff options
| author | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-05-29 09:47:12 -0500 |
|---|---|---|
| committer | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-05-29 09:53:05 -0500 |
| commit | c04e6b19737f62ac6dd5269df5019ad1b26a92eb (patch) | |
| tree | a32cd919464768d727cfd2a8a97b9df1f69aec18 | |
| parent | d6fd114626698bf579440600fb39ec6665a67b3d (diff) | |
| download | gitlab-ce-62124-new-threaded-discussion-design.tar.gz | |
Add side by side view and remove escape for url62124-new-threaded-discussion-design
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 3124ed97ac8..c2342cd21f8 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -990,7 +990,7 @@ export default class Notes { '<div class="avatar-note-form-holder"><div class="content"><a href="' + escape(gon.current_username) + '" class="user-avatar-link d-none d-sm-block"><img class="avatar s40" src="' + - escape(gon.current_user_avatar_url) + + encodeURI(gon.current_user_avatar_url) + '" alt="' + escape(gon.current_user_fullname) + '" /></a></div></div>', diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index c33d5489948..bb0ab05c4e1 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -518,7 +518,8 @@ $note-form-margin-left: 72px; } } -.commit-diff { +.commit-diff, +.diff-wrap-lines { .notes-content { background-color: $white-light; |