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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c4b9b2cf
Commit
c4b9b2cf
authored
Feb 29, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wrap icon with edited time
parent
a0f440ef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
c4b9b2cf
...
@@ -22,7 +22,7 @@ ul.notes {
...
@@ -22,7 +22,7 @@ ul.notes {
margin-left
:
55px
;
margin-left
:
55px
;
}
}
.note_created_ago
,
.note
_edited_ago
{
.note_created_ago
,
.note
-updated-at
{
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
...
...
app/views/projects/notes/_note.html.haml
View file @
c4b9b2cf
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
%a
{
name:
dom_id
(
note
),
href:
"##{dom_id(note)}"
,
title:
'Link here'
}
%a
{
name:
dom_id
(
note
),
href:
"##{dom_id(note)}"
,
title:
'Link here'
}
=
time_ago_with_tooltip
(
note
.
created_at
,
placement:
'bottom'
,
html_class:
'note_created_ago'
)
=
time_ago_with_tooltip
(
note
.
created_at
,
placement:
'bottom'
,
html_class:
'note_created_ago'
)
-
if
note
.
updated_at
!=
note
.
created_at
-
if
note
.
updated_at
!=
note
.
created_at
%span
%span
.note-updated-at
·
·
=
icon
(
'edit'
,
title:
'edited'
)
=
icon
(
'edit'
,
title:
'edited'
)
=
time_ago_with_tooltip
(
note
.
updated_at
,
placement:
'bottom'
,
html_class:
'note_edited_ago'
)
=
time_ago_with_tooltip
(
note
.
updated_at
,
placement:
'bottom'
,
html_class:
'note_edited_ago'
)
...
...
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