Merge branch 'feature/rails3' into migration/issue_relations

pull/448/head
Jens Ulferts 11 years ago
commit 62c52874ed
  1. 9
      app/assets/stylesheets/default/application.css.erb
  2. 2
      app/views/news/show.html.erb
  3. 2
      doc/CHANGELOG.md

@ -3436,4 +3436,13 @@ input::-webkit-input-placeholder {
opacity: 1;
filter:Alpha(Opacity=100);
font-weight: bold;
}
h4.comment {
margin-bottom: 8px;
margin-top: 18px;
}
h4.comment img {
margin-right: 3px;
}

@ -76,7 +76,7 @@ See doc/COPYRIGHT.rdoc for more details.
:title => l(:button_delete),
:alt => l(:button_delete) %>
</div>
<h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
<h4 class="comment"><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
<%= textilizable(comment.comments) %>
<% end %>
</div>

@ -29,6 +29,8 @@ See doc/COPYRIGHT.rdoc for more details.
# Changelog
* `#1770` New Comment Section layout errors
## 3.0.0pre17
* `#1323` Wrong Calendarweek in Datepicker, replaced built in datepicker with jQuery UI datepicker

Loading…
Cancel
Save