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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0cb6370a
Commit
0cb6370a
authored
Apr 12, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix note header timeago and action overlap
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/30810
parent
a62ae94d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
18 deletions
+35
-18
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+20
-5
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+15
-13
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
0cb6370a
...
@@ -344,6 +344,15 @@ ul.notes {
...
@@ -344,6 +344,15 @@ ul.notes {
font-size
:
14px
;
font-size
:
14px
;
}
}
.note-header
{
display
:
flex
;
justify-content
:
space-between
;
}
.note-header-info
{
min-width
:
0
;
}
.note-headline-light
{
.note-headline-light
{
display
:
inline
;
display
:
inline
;
...
@@ -363,21 +372,27 @@ ul.notes {
...
@@ -363,21 +372,27 @@ ul.notes {
}
}
}
}
.note-headline-meta
{
display
:
inline-block
;
white-space
:
nowrap
;
}
/**
/**
* Actions for Discussions/Notes
* Actions for Discussions/Notes
*/
*/
.discussion-actions
,
.discussion-actions
{
.note-actions
{
float
:
right
;
float
:
right
;
margin-left
:
10px
;
margin-left
:
10px
;
color
:
$gray-darkest
;
color
:
$gray-darkest
;
}
}
.note-actions
{
.note-actions
{
position
:
absolute
;
flex-shrink
:
0
;
right
:
0
;
// For PhantomJS that does not support flex
top
:
0
;
float
:
right
;
margin-left
:
10px
;
color
:
$gray-darkest
;
.note-action-button
{
.note-action-button
{
margin-left
:
8px
;
margin-left
:
8px
;
...
...
app/views/projects/notes/_note.html.haml
View file @
0cb6370a
...
@@ -12,12 +12,14 @@
...
@@ -12,12 +12,14 @@
=
image_tag
avatar_icon
(
note
.
author
),
alt:
''
,
class:
'avatar s40'
=
image_tag
avatar_icon
(
note
.
author
),
alt:
''
,
class:
'avatar s40'
.timeline-content
.timeline-content
.note-header
.note-header
%a
.visible-xs
{
href:
user_path
(
note
.
author
)
}
.note-header-info
=
note
.
author
.
to_reference
%a
{
href:
user_path
(
note
.
author
)
}
=
link_to_member
(
note
.
project
,
note
.
author
,
avatar:
false
,
extra_class:
'hidden-xs'
)
.note-headline-light
%span
.hidden-xs
%span
.hidden-xs
=
sanitize
(
note
.
author
.
name
)
%span
.note-headline-light
=
note
.
author
.
to_reference
=
note
.
author
.
to_reference
%span
.note-headline-light
%span
.note-headline-meta
-
unless
note
.
system
-
unless
note
.
system
commented
commented
-
if
note
.
system
-
if
note
.
system
...
...
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