deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

better event-notes typography

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-04 22:00:51 +02:00
parent d54845a16a
commit 730e79e787
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file

@ -95,3 +95,7 @@ a:focus {
.white .highlight pre { background: #f5f5f5; } .white .highlight pre { background: #f5f5f5; }
ul { margin: 0 0 9px 25px !important; } ul { margin: 0 0 9px 25px !important; }
} }
.md {
@include md-typography;
}

12
app/assets/stylesheets/sections/events.scss
View file

@ -48,15 +48,13 @@
color: #666; color: #666;
} }
.event-note { .event-note {
padding-top: 5px;
padding-left: 5px;
display: inline-block;
color: #555; color: #555;
margin-top: 5px;
margin-left: 40px;
.note-file-attach { .note-file-attach {
margin-left: -25px;
float: left;
.note-image-attach { .note-image-attach {
margin-top: 4px;
margin-left: 0px; margin-left: 0px;
max-width: 200px; max-width: 200px;
} }
@ -66,8 +64,8 @@
color: #777; color: #777;
float: left; float: left;
font-size: 16px; font-size: 16px;
line-height: 18px; line-height: 16px;
margin: 5px; margin-right: 5px;
} }
} }
.avatar { .avatar {

7
app/views/events/event/_note.html.haml
View file

@ -21,9 +21,10 @@
= event.project_name = event.project_name
.event-body .event-body
%i.icon-comment-alt.event-note-icon .event-note
%span.event-note .md
= markdown truncate(event.target.note, length: 70) %i.icon-comment-alt.event-note-icon
= sanitize(markdown(truncate(event.target.note, length: 150)), tags: %w(a img b pre p))
- note = event.target - note = event.target
- if note.attachment.url - if note.attachment.url
= link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do = link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do