# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1299163123 0
# Node ID c90c42a771ec854d0ad19c1185a71a4fefabab1f
# Parent  0009fec5f11c6db62672278875b002c74c01f476
* Restore further things broken during merge

diff -r 0009fec5f11c -r c90c42a771ec config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Thu Mar 03 14:17:06 2011 +0000
+++ b/config/locales/en-GB.yml	Thu Mar 03 14:38:43 2011 +0000
@@ -202,6 +202,8 @@
   gui_validation_error: 1 error
   gui_validation_error_plural: "%{count} errors"
   
+  field_ssamr_user_detail:
+    description: User Description
     institution: Institution
 
   field_other_institution: ''
diff -r 0009fec5f11c -r c90c42a771ec public/stylesheets/application.css
--- a/public/stylesheets/application.css	Thu Mar 03 14:17:06 2011 +0000
+++ b/public/stylesheets/application.css	Thu Mar 03 14:38:43 2011 +0000
@@ -352,8 +352,7 @@
 ul.projects ul.projects { border-left: 3px solid #e0e0e0; }
 ul.projects li.root { list-style-type:none; margin-bottom: 1em; }
 ul.projects li.child { list-style-type:none; margin-top: 1em;}
-ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
-.my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
+ul.projects div.root a.project { font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
 
 #tracker_project_ids ul { margin: 0;  padding-left: 1em; }
 #tracker_project_ids li { list-style-type:none; }