diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-12-22 21:38:44 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-12-22 22:06:33 +0300 |
commit | 7d7ba0b441bf600f3c047afdb1f7355ae690cd8a (patch) | |
tree | 5eb0eb7f6ea76957fb1c1d51410fb02ce75ef006 /app/assets | |
parent | 47550d092f0a6cbedc58752d1a220fe519b8ea01 (diff) |
Fix text overflow
Fix text overflow in comments in MR
Adds MR ID to CHANGELOG entry
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 29 |
1 files changed, 18 insertions, 11 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; + } +} |