diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-12-22 18:38:44 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-12-22 19:06:33 +0000 |
| commit | 7d7ba0b441bf600f3c047afdb1f7355ae690cd8a (patch) | |
| tree | 5eb0eb7f6ea76957fb1c1d51410fb02ce75ef006 | |
| parent | 47550d092f0a6cbedc58752d1a220fe519b8ea01 (diff) | |
| download | gitlab-ce-25930-discussion-actions-overlap-header-text.tar.gz | |
Fix text overflow25930-discussion-actions-overlap-header-text
Fix text overflow in comments in MR
Adds MR ID to CHANGELOG entry
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 29 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/25930-discussion-actions-overlap-header-text.yml | 4 |
3 files changed, 23 insertions, 12 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 6ac4ec6ea0d..b512da0939f 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -43,7 +43,7 @@ ul.notes { } .system-note-message { - display: inline; + display: inline-block; &::first-letter { text-transform: lowercase; @@ -55,7 +55,7 @@ ul.notes { } p { - display: inline; + display: inline-block; margin: 0; &::first-letter { @@ -151,10 +151,6 @@ ul.notes { } } } - - .note-headline-light { - display: inline; - } } .discussion-body { @@ -452,11 +448,6 @@ ul.notes { border-radius: $border-radius-base; } -.diff-file .note .note-actions { - right: 0; - top: 0; -} - /** * Line note button on the side of diffs @@ -590,3 +581,19 @@ ul.notes { } } } + +// Merge request notes in diffs +.diff-file { + + // Diff is side by side + .notes_content.parallel .note-header .note-headline-light { + display: block; + position: relative; + } + + // Diff is inline + .notes_content .note-header .note-headline-light { + display: inline-block; + position: relative; + } +} diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 778a32e6345..399cf85cd0f 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -10,7 +10,7 @@ .timeline-content .note-header = link_to_member(note.project, note.author, avatar: false) - .inline.note-headline-light + .note-headline-light = note.author.to_reference - unless note.system commented diff --git a/changelogs/unreleased/25930-discussion-actions-overlap-header-text.yml b/changelogs/unreleased/25930-discussion-actions-overlap-header-text.yml new file mode 100644 index 00000000000..54a461c24ed --- /dev/null +++ b/changelogs/unreleased/25930-discussion-actions-overlap-header-text.yml @@ -0,0 +1,4 @@ +--- +title: Fix discussion overlap text in regular screens +merge_request: 8273 +author: |