Commit 0b0e0225adfc83ed951118b3c3e82167add9fd03
1 parent
2ed5211d
Exists in
master
and in
4 other branches
css fixes
Showing
3 changed files
with
3 additions
and
6 deletions
Show diff stats
app/assets/stylesheets/projects.css.scss
| @@ -686,7 +686,6 @@ table.highlighttable pre{ | @@ -686,7 +686,6 @@ table.highlighttable pre{ | ||
| 686 | width:200px; | 686 | width:200px; |
| 687 | } | 687 | } |
| 688 | 688 | ||
| 689 | - | ||
| 690 | body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} | 689 | body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} |
| 691 | body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} | 690 | body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} |
| 692 | body.project-page #notes-list .note img{float: left; margin-right: 10px;} | 691 | body.project-page #notes-list .note img{float: left; margin-right: 10px;} |
app/views/issues/show.html.haml
| @@ -7,10 +7,6 @@ | @@ -7,10 +7,6 @@ | ||
| 7 | %center= image_tag "ajax-loader.gif" | 7 | %center= image_tag "ajax-loader.gif" |
| 8 | .right.width-30p | 8 | .right.width-30p |
| 9 | .span-8 | 9 | .span-8 |
| 10 | - - if @issue.closed | ||
| 11 | - %center.success Closed | ||
| 12 | - - else | ||
| 13 | - %center.error Open | ||
| 14 | %table.round-borders | 10 | %table.round-borders |
| 15 | %tr | 11 | %tr |
| 16 | %td Title: | 12 | %td Title: |
app/views/notes/_show.html.haml
| @@ -2,7 +2,9 @@ | @@ -2,7 +2,9 @@ | ||
| 2 | = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" | 2 | = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" |
| 3 | %div.note-author | 3 | %div.note-author |
| 4 | %strong= note.author_name | 4 | %strong= note.author_name |
| 5 | - = time_ago_in_words(note.updated_at) | 5 | + %cite |
| 6 | + = time_ago_in_words(note.updated_at) | ||
| 7 | + ago | ||
| 6 | - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project) | 8 | - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project) |
| 7 | = link_to 'Remove', [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-note right negative" | 9 | = link_to 'Remove', [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-note right negative" |
| 8 | 10 |