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