Commit a7dcf690 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix discussion style for timeline

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 207d798d
...@@ -21,6 +21,13 @@ ...@@ -21,6 +21,13 @@
clear: both; clear: both;
&:target {
.timeline-entry-inner .timeline-content {
-webkit-animation:target-note 2s linear;
background: $hover;
}
}
.timeline-entry-inner { .timeline-entry-inner {
position: relative; position: relative;
margin-left: -20px; margin-left: -20px;
...@@ -37,6 +44,10 @@ ...@@ -37,6 +44,10 @@
float: left; float: left;
@include border-radius(4px); @include border-radius(4px);
@include box-shadow(0 0 0 3px #EEE); @include box-shadow(0 0 0 3px #EEE);
.avatar {
margin: 0;
}
} }
.timeline-content { .timeline-content {
......
...@@ -17,7 +17,6 @@ ul.notes { ...@@ -17,7 +17,6 @@ ul.notes {
.discussion-header, .discussion-header,
.note-header { .note-header {
@extend .cgray; @extend .cgray;
padding-top: 5px;
padding-bottom: 15px; padding-bottom: 15px;
.avatar { .avatar {
...@@ -43,25 +42,15 @@ ul.notes { ...@@ -43,25 +42,15 @@ ul.notes {
} }
.discussion { .discussion {
padding: 10px 0;
overflow: hidden; overflow: hidden;
display: block; display: block;
position:relative; position:relative;
border-bottom: 1px solid #EEE;
.discussion-body {
margin-left: 50px;
}
} }
.note { .note {
display: block; display: block;
position:relative; position:relative;
p { color: $style_color; } p { color: $style_color; }
.avatar {
margin: 0;
}
.attachment { .attachment {
font-size: 14px; font-size: 14px;
} }
...@@ -76,11 +65,6 @@ ul.notes { ...@@ -76,11 +65,6 @@ ul.notes {
border-bottom: none; border-bottom: none;
} }
} }
.note:target {
-webkit-animation:target-note 2s linear;
background: #fffff0;
}
} }
.diff-file .notes_holder { .diff-file .notes_holder {
...@@ -95,7 +79,7 @@ ul.notes { ...@@ -95,7 +79,7 @@ ul.notes {
&.notes_line { &.notes_line {
text-align: center; text-align: center;
padding: 10px 0; padding: 10px 0;
background: #eee; background: #FFF;
} }
&.notes_line2 { &.notes_line2 {
text-align: center; text-align: center;
...@@ -358,3 +342,7 @@ ul.notes { ...@@ -358,3 +342,7 @@ ul.notes {
border-top: 1px solid #DDD; border-top: 1px solid #DDD;
} }
} }
.discussion-notes-count {
font-size: 16px;
}
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- if !defined?(line) || line == note.diff_line - if !defined?(line) || line == note.diff_line
%tr.notes_holder %tr.notes_holder
%td.notes_line{ colspan: 2 } %td.notes_line{ colspan: 2 }
%span.btn.disabled %span.discussion-notes-count
%i.icon-comment %i.icon-comment
= notes.count = notes.count
%td.notes_content %td.notes_content
......
- note = discussion_notes.first - note = discussion_notes.first
- if note.for_merge_request? .timeline-entry
.timeline-entry-inner
.timeline-icon
= image_tag avatar_icon(note.author_email), class: "avatar s32"
.timeline-content
- if note.for_merge_request?
- if note.outdated? - if note.outdated?
= render "projects/notes/discussions/outdated", discussion_notes: discussion_notes = render "projects/notes/discussions/outdated", discussion_notes: discussion_notes
- else - else
= render "projects/notes/discussions/active", discussion_notes: discussion_notes = render "projects/notes/discussions/active", discussion_notes: discussion_notes
- else - else
= render "projects/notes/discussions/commit", discussion_notes: discussion_notes = render "projects/notes/discussions/commit", discussion_notes: discussion_notes
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
= link_to "#", class: "js-toggle-button" do = link_to "#", class: "js-toggle-button" do
%i.icon-chevron-up %i.icon-chevron-up
Show/hide discussion Show/hide discussion
= image_tag avatar_icon(note.author_email), class: "avatar s32"
%div %div
= link_to_member(@project, note.author, avatar: false) = link_to_member(@project, note.author, avatar: false)
started a discussion started a discussion
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
= link_to "#", class: "js-toggle-button" do = link_to "#", class: "js-toggle-button" do
%i.icon-chevron-up %i.icon-chevron-up
Show/hide discussion Show/hide discussion
= image_tag avatar_icon(note.author_email), class: "avatar s32"
%div %div
= link_to_member(@project, note.author, avatar: false) = link_to_member(@project, note.author, avatar: false)
started a discussion on commit started a discussion on commit
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
= link_to "#", class: "js-toggle-button" do = link_to "#", class: "js-toggle-button" do
%i.icon-chevron-down %i.icon-chevron-down
Show/hide discussion Show/hide discussion
= image_tag avatar_icon(note.author_email), class: "avatar s32"
%div %div
= link_to_member(@project, note.author, avatar: false) = link_to_member(@project, note.author, avatar: false)
started a discussion on the started a discussion on the
......
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