diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-05-25 07:57:33 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-05-25 08:02:58 +0300 |
| commit | 068e5e21b360e976c582bb751ce93ac6668b6bdf (patch) | |
| tree | 0de0d9f1e0615450a220cbea8d72ce57bea9bf75 /app/assets/stylesheets/pages/notes.scss | |
| parent | 34a6d80e1146b2e88a95f91c2bd84214f130d4c5 (diff) | |
Fix note header author and time ago wrapping in parallel diff
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 4b15fc2bd82..c1e613e8f3d 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -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 { |