Mercurial > hg > soundsoftware-site

changeset 1223:324461c477a7 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 12 Mar 2013 14:39:49 +0000
parents 2c59ee348e2b (current diff) 31aee88c279b (diff)
children 30c444ea1338
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/config/locales/en.yml	Tue Mar 12 14:39:44 2013 +0000
+++ b/config/locales/en.yml	Tue Mar 12 14:39:49 2013 +0000
@@ -883,7 +883,7 @@
   label_parent_revision: Parent
   label_child_revision: Child
   label_export_options: %{export_format} export options
-  label_my_colleagues: People I'm working with
+  label_my_colleagues: "Active projects for people I'm working with"
   label_working_in: Working in 
   label_no_active_colleagues: No recent activity
 
--- a/public/stylesheets/application.css	Tue Mar 12 14:39:44 2013 +0000
+++ b/public/stylesheets/application.css	Tue Mar 12 14:39:49 2013 +0000
@@ -1035,7 +1035,8 @@
 
 #activity dt img.gravatar, #members dt img.gravatar, #active-colleagues img.gravatar {
     float: left;
-    margin: 0 1em 1em 0;
+    clear: left;
+    margin: 0.2em 1em 0.4em 0;
 }
 
 /* Used on 12px Gravatar img tags without the icon background */