Merged r16820 and r16821 (#26424).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16822 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index 09e14f61f097ede7b0ad741d5837b68af4f7a570..72c94a9c72d95a4e553e5b35c3eda3360489a6ec 100644 (file)
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -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;">

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index da7d3efa75b5cad2191bd3f01454967daf444ca5..a77589ef1a8c557050cb64d0908505a800226485 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -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;}