Commit cb819ef7 authored by Fatih Acet's avatar Fatih Acet

Merge branch '25930-discussion-actions-overlap-header-text' into 'master'

Fix text overflow

Closes #25930

See merge request !8273
parents 406f4cd5 7d7ba0b4
...@@ -43,7 +43,7 @@ ul.notes { ...@@ -43,7 +43,7 @@ ul.notes {
} }
.system-note-message { .system-note-message {
display: inline; display: inline-block;
&::first-letter { &::first-letter {
text-transform: lowercase; text-transform: lowercase;
...@@ -55,7 +55,7 @@ ul.notes { ...@@ -55,7 +55,7 @@ ul.notes {
} }
p { p {
display: inline; display: inline-block;
margin: 0; margin: 0;
&::first-letter { &::first-letter {
...@@ -151,10 +151,6 @@ ul.notes { ...@@ -151,10 +151,6 @@ ul.notes {
} }
} }
} }
.note-headline-light {
display: inline;
}
} }
.discussion-body { .discussion-body {
...@@ -452,11 +448,6 @@ ul.notes { ...@@ -452,11 +448,6 @@ ul.notes {
border-radius: $border-radius-base; border-radius: $border-radius-base;
} }
.diff-file .note .note-actions {
right: 0;
top: 0;
}
/** /**
* Line note button on the side of diffs * Line note button on the side of diffs
...@@ -590,3 +581,19 @@ ul.notes { ...@@ -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;
}
}
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.timeline-content .timeline-content
.note-header .note-header
= link_to_member(note.project, note.author, avatar: false) = link_to_member(note.project, note.author, avatar: false)
.inline.note-headline-light .note-headline-light
= note.author.to_reference = note.author.to_reference
- unless note.system - unless note.system
commented commented
......
---
title: Fix discussion overlap text in regular screens
merge_request: 8273
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment