Styling .info selector is not specific enough.

git-svn-id: http://svn.redmine.org/redmine/trunk@18863 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 11e843099499cf4e4948b8171a066eaca51280e5..eef03218c0c1ff8a57040013a8191a9228f07728 100644 (file)
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -47,7 +47,7 @@ module MembersHelper
     end.compact.uniq
 
     if content.present?
-      content_tag('span', content.join(", "), :class => "info")
+      content_tag('em', content.join(", "), :class => "info")
     end
   end
 end

diff --git a/app/views/members/_edit.html.erb b/app/views/members/_edit.html.erb
index e3c5ec747edb5efbd57d7b0ceed8e9f573e263c9..8b05ae92f68cbfc16bff50091acf28644464cd1e 100644 (file)
--- a/app/views/members/_edit.html.erb
+++ b/app/views/members/_edit.html.erb
@@ -4,13 +4,13 @@
                       :method => :put) do |f| %>
   <p>
     <% @roles.each do |role| %>
-    <label>
+    <label class="block">
       <%= check_box_tag('membership[role_ids][]',
                         role.id, @member.roles.to_a.include?(role),
                         :id => nil,
                         :disabled => !@member.role_editable?(role)) %> <%= role %>
       <%= render_role_inheritance(@member, role) %>
-    </label><br />
+    </label>
     <% end %>
   </p>
   <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>

diff --git a/app/views/principal_memberships/_edit.html.erb b/app/views/principal_memberships/_edit.html.erb
index d0ab4f10a1536f3dce200de611c90fb82c90a110..224303b7ad044155b8eac98ad6f5e21ab7ad91bb 100644 (file)
--- a/app/views/principal_memberships/_edit.html.erb
+++ b/app/views/principal_memberships/_edit.html.erb
@@ -4,13 +4,13 @@
                           :method => :put) do %>
   <p>
   <% @roles.each do |role| %>
-    <label>
+    <label class="block">
       <%= check_box_tag 'membership[role_ids][]',
             role.id, @membership.roles.to_a.include?(role),
             :id => nil,
             :disabled => !@membership.role_editable?(role) %> <%= role.name %>
       <%= render_role_inheritance(@membership, role) %>
-    </label><br />
+    </label>
   <% end %>
   </p>
   <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0abd4fdaef4e79478e6331f7dec64b5858c69f24..88be93c37b43f0bf882cf39aa1ca6fa905f3e86a 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -892,12 +892,9 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 
 a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
 
-.info {font-size:90%;color:#888;}
-em.info {font-style:normal;display:block;}
+em.info {font-style:normal;display:block;font-size:90%;color:#888;}
 em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
 
-form.edit_membership p {margin:0.9em 0;}
-
 textarea.text_cf {width:95%; resize:vertical;}
 input.string_cf, input.link_cf {width:95%;}
 select.bool_cf {width:auto !important;}