kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix note header author and time ago wrapping in parallel diff

Browse source 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
This commit is contained in:
Eric Eastwood 2017-05-24 23:57:33 -05:00
parent 34a6d80e11
commit 068e5e21b3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/pages/notes.scss
View file

@ -380,6 +380,12 @@ ul.notes {
padding-bottom: 5px;
}
.note-header-author-name {
@media (max-width: $screen-xs-max) {
display: none;
}
}
.note-headline-light {
display: inline;
@ -717,9 +723,8 @@ ul.notes {
// Merge request notes in diffs
.diff-file {
// Diff is side by side
.notes_content.parallel .note-header .note-headline-light {
.notes_content.parallel .note-header .note-header-author-name {
display: block;
position: relative;
}
// Diff is inline
.notes_content .note-header .note-headline-light {

2
app/views/shared/notes/_note.html.haml
View file

@ -18,7 +18,7 @@
.note-header
.note-header-info
%a{ href: user_path(note.author) }
%span.hidden-xs
%span.note-header-author-name
= sanitize(note.author.name)
%span.note-headline-light
= note.author.to_reference