mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-20 15:59:53 +00:00
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:
parent
742440e038
commit
f9ff1c1a15
@ -8,7 +8,7 @@
|
|||||||
<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
|
<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
|
||||||
</div>
|
</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') %>
|
<% if authorize_for('news', 'edit') %>
|
||||||
<div id="edit-news" style="display:none;">
|
<div id="edit-news" style="display:none;">
|
||||||
|
|||||||
@ -1327,8 +1327,7 @@ div.gravatar-with-child > img.gravatar:nth-child(2) {
|
|||||||
border: 2px solid rgba(255, 255, 255, 0.9);
|
border: 2px solid rgba(255, 255, 255, 0.9);
|
||||||
}
|
}
|
||||||
|
|
||||||
h2 img.gravatar {margin: -2px 4px -4px 0;}
|
h2 img.gravatar, h3 img.gravatar {margin-right: 4px;}
|
||||||
h3 img.gravatar {margin: -4px 4px -4px 0;}
|
|
||||||
h4 img.gravatar {margin: -2px 4px -4px 0;}
|
h4 img.gravatar {margin: -2px 4px -4px 0;}
|
||||||
td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
|
td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
|
||||||
#activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}
|
#activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user