diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-12-23 23:32:32 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-23 23:32:32 +0300 |
commit | cb819ef75a8933c80df7d670cdcbb4dbd023efa7 (patch) | |
tree | 6e891e904fa38b406b12d601d6dd18e5ca68cff7 /app/assets | |
parent | 406f4cd59eabb493fbd00379cea86980eb5ef05e (diff) | |
parent | 7d7ba0b441bf600f3c047afdb1f7355ae690cd8a (diff) |
Merge branch '25930-discussion-actions-overlap-header-text' into 'master'
Fix text overflow
Closes #25930
See merge request !8273
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; + } +} |