Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
068e5e21
Commit
068e5e21
authored
May 24, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix note header author and time ago wrapping in parallel diff
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
parent
34a6d80e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+7
-2
app/views/shared/notes/_note.html.haml
app/views/shared/notes/_note.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
068e5e21
...
@@ -380,6 +380,12 @@ ul.notes {
...
@@ -380,6 +380,12 @@ ul.notes {
padding-bottom
:
5px
;
padding-bottom
:
5px
;
}
}
.note-header-author-name
{
@media
(
max-width
:
$screen-xs-max
)
{
display
:
none
;
}
}
.note-headline-light
{
.note-headline-light
{
display
:
inline
;
display
:
inline
;
...
@@ -717,9 +723,8 @@ ul.notes {
...
@@ -717,9 +723,8 @@ ul.notes {
// Merge request notes in diffs
// Merge request notes in diffs
.diff-file
{
.diff-file
{
// Diff is side by side
// Diff is side by side
.notes_content.parallel
.note-header
.note-head
line-light
{
.notes_content.parallel
.note-header
.note-head
er-author-name
{
display
:
block
;
display
:
block
;
position
:
relative
;
}
}
// Diff is inline
// Diff is inline
.notes_content
.note-header
.note-headline-light
{
.notes_content
.note-header
.note-headline-light
{
...
...
app/views/shared/notes/_note.html.haml
View file @
068e5e21
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.note-header
.note-header
.note-header-info
.note-header-info
%a
{
href:
user_path
(
note
.
author
)
}
%a
{
href:
user_path
(
note
.
author
)
}
%span
.
hidden-xs
%span
.
note-header-author-name
=
sanitize
(
note
.
author
.
name
)
=
sanitize
(
note
.
author
.
name
)
%span
.note-headline-light
%span
.note-headline-light
=
note
.
author
.
to_reference
=
note
.
author
.
to_reference
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment