Merged r16820 and r16821 (#26424).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16822 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-07-16 11:52:48 +00:00
parent 742440e038
commit f9ff1c1a15
2 changed files with 2 additions and 3 deletions

View File

@ -8,7 +8,7 @@
<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
</div>
<h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
<h2><%= avatar(@news.author, :size => "24") %> <%=h @news.title %></h2>
<% if authorize_for('news', 'edit') %>
<div id="edit-news" style="display:none;">

View File

@ -1327,8 +1327,7 @@ div.gravatar-with-child > img.gravatar:nth-child(2) {
border: 2px solid rgba(255, 255, 255, 0.9);
}
h2 img.gravatar {margin: -2px 4px -4px 0;}
h3 img.gravatar {margin: -4px 4px -4px 0;}
h2 img.gravatar, h3 img.gravatar {margin-right: 4px;}
h4 img.gravatar {margin: -2px 4px -4px 0;}
td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
#activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}