Commit 4bea030c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Style system notes

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent def4d8b9
...@@ -148,3 +148,10 @@ $btn-default-border: #e7e9ed; ...@@ -148,3 +148,10 @@ $btn-default-border: #e7e9ed;
// //
//## //##
$nav-link-padding: 13px $gl-padding; $nav-link-padding: 13px $gl-padding;
//== Code
//
//##
$pre-bg: #f8fafc !default;
$pre-color: $gl-gray !default;
$pre-border-color: #e7e9ed;
...@@ -28,39 +28,9 @@ ...@@ -28,39 +28,9 @@
} }
} }
.system-note .timeline-entry-inner { .system-note {
.timeline-icon { .note-text {
float: left; color: $gl-gray !important;
margin-left: 12px;
margin-top: 8px;
@include box-shadow(none);
span {
margin: 0 2px;
font-size: 16px;
color: #eeeeee;
}
}
.timeline-content {
background: none;
margin-left: 45px;
padding: 0px 15px;
&:after { border: 0; }
.note-header {
span { font-size: 12px; }
.avatar {
margin-right: 5px;
}
}
.note-text {
font-size: 12px;
margin-left: 20px;
}
} }
} }
} }
......
...@@ -34,10 +34,8 @@ ul.notes { ...@@ -34,10 +34,8 @@ ul.notes {
content: "\00b7"; content: "\00b7";
} }
font-size: 13px;
a { a {
@extend .cgray; color: $gl-gray;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
...@@ -45,8 +43,9 @@ ul.notes { ...@@ -45,8 +43,9 @@ ul.notes {
} }
} }
.author { .author {
color: #333; color: #4c4e54;
font-weight: bold; margin-right: 3px;
&:hover { &:hover {
color: $gl-link-color; color: $gl-link-color;
} }
......
%li.timeline-entry{ id: dom_id(note), class: [dom_class(note), "note-row-#{note.id}", ('system-note' if note.system)], data: { discussion: note.discussion_id } } %li.timeline-entry{ id: dom_id(note), class: [dom_class(note), "note-row-#{note.id}", ('system-note' if note.system)], data: { discussion: note.discussion_id } }
.timeline-entry-inner .timeline-entry-inner
.timeline-icon .timeline-icon
- if note.system = link_to user_path(note.author) do
%span= icon('circle') = image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: ''
- else
= link_to user_path(note.author) do
= image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: ''
.timeline-content .timeline-content
.note-header .note-header
- if note_editable?(note) - if note_editable?(note)
...@@ -22,10 +19,6 @@ ...@@ -22,10 +19,6 @@
%span.note-role.label %span.note-role.label
= member.human_access = member.human_access
- if note.system
= link_to user_path(note.author) do
= image_tag avatar_icon(note.author_email), class: 'avatar s16', alt: ''
= link_to_member(note.project, note.author, avatar: false) = link_to_member(note.project, note.author, avatar: false)
%span.author-username %span.author-username
......
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