diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png
index d5577d4b71..c511bd90fb 100644
Binary files a/app/assets/images/sprite.png and b/app/assets/images/sprite.png differ
diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg
index b50b969e90..92350301d8 100644
--- a/app/assets/images/sprite.svg
+++ b/app/assets/images/sprite.svg
@@ -13,7 +13,7 @@
height="200"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.91 r13725"
inkscape:export-filename="/home/tom/rails/app/assets/images/sprite.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
@@ -280,5 +280,11 @@
id="tspan3023"
x="264.8125"
y="869.62622">?
+
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6706aa6ed9..009082e289 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -175,6 +175,7 @@ small, aside {
.icon.close:hover { background-position: -200px -20px; }
.icon.check { background-position: -220px 0; }
.icon.note { background-position: -240px 0; }
+.icon.note.grey { background-position: -240px -20px; }
.icon.query { background-position: -260px 0; }
/* Rules for links */
@@ -1059,6 +1060,15 @@ tr.turn:hover {
color: #000;
}
}
+
+ .comments {
+ float: right;
+ color: #999;
+ }
+
+ .comments-0 {
+ opacity: 0.5;
+ }
}
/* Rules for the browse sidebar */
diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 2ce024c764..5b55980e3e 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -294,7 +294,7 @@ def list
changesets = changesets.where("changesets.id <= ?", params[:max_id])
end
- @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags)
+ @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
render :action => :list, :layout => false
end
diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index cbc60695b8..f27b0bc911 100644
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -18,6 +18,10 @@
<%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
+
<%= changeset_details(changeset) %>
·