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
04a87cb5
Commit
04a87cb5
authored
Aug 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Round avatars for notes timeline
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a7dcf690
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
app/assets/stylesheets/generic/timeline.scss
app/assets/stylesheets/generic/timeline.scss
+4
-2
app/views/projects/notes/_discussion.html.haml
app/views/projects/notes/_discussion.html.haml
+1
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/timeline.scss
View file @
04a87cb5
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
content
:
" "
;
content
:
" "
;
width
:
3px
;
width
:
3px
;
background-color
:
#eeeeee
;
background-color
:
#eeeeee
;
margin-left
:
2
5
px
;
margin-left
:
2
9
px
;
}
}
.timeline-entry
{
.timeline-entry
{
...
@@ -42,11 +42,13 @@
...
@@ -42,11 +42,13 @@
background
:
#fff
;
background
:
#fff
;
color
:
#737881
;
color
:
#737881
;
float
:
left
;
float
:
left
;
@include
border-radius
(
4px
);
@include
border-radius
(
4
0
px
);
@include
box-shadow
(
0
0
0
3px
#EEE
);
@include
box-shadow
(
0
0
0
3px
#EEE
);
overflow
:
hidden
;
.avatar
{
.avatar
{
margin
:
0
;
margin
:
0
;
padding
:
0
;
}
}
}
}
...
...
app/views/projects/notes/_discussion.html.haml
View file @
04a87cb5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.timeline-entry
.timeline-entry
.timeline-entry-inner
.timeline-entry-inner
.timeline-icon
.timeline-icon
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s
32
"
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s
40
"
.timeline-content
.timeline-content
-
if
note
.
for_merge_request?
-
if
note
.
for_merge_request?
-
if
note
.
outdated?
-
if
note
.
outdated?
...
...
app/views/projects/notes/_note.html.haml
View file @
04a87cb5
%li
.timeline-entry
{
id:
dom_id
(
note
),
class:
dom_class
(
note
),
data:
{
discussion:
note
.
discussion_id
}
}
%li
.timeline-entry
{
id:
dom_id
(
note
),
class:
dom_class
(
note
),
data:
{
discussion:
note
.
discussion_id
}
}
.timeline-entry-inner
.timeline-entry-inner
.timeline-icon
.timeline-icon
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s
32
"
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s
40
"
.timeline-content
.timeline-content
.note-header
.note-header
.note-actions
.note-actions
...
...
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