Merged r14552 (#20633).

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

diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 988d6532f5555879f3976b1e73987bc65f4dd585..2de4c4037feec61ec5b7dba07c6e4998a87ae026 100644 (file)
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -80,7 +80,8 @@ module CustomFieldsHelper
   # Return custom field name tag
   def custom_field_name_tag(custom_field)
     title = custom_field.description.presence
-    content_tag 'span', custom_field.name, :title => title
+    css = title ? "field-description" : nil
+    content_tag 'span', custom_field.name, :title => title, :class => css
   end
   
   # Return custom field label tag

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8e4bf8d9c5606fc12e40765ca00107bc6ca69184..411b9335690cb687066e49715c809da4e4d2f092 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -328,7 +328,7 @@ legend {color: #484848;}
 hr { width: 100%; height: 1px; background: #ccc; border: 0;}
 blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
 blockquote blockquote { margin-left: 0;}
-abbr, span[title] { border-bottom: 1px dotted #aaa; cursor: help; }
+abbr, span.field-description[title] { border-bottom: 1px dotted #aaa; cursor: help; }
 textarea.wiki-edit {width:99%; resize:vertical;}
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}