Browse Source

Styling .info selector is not specific enough.

git-svn-id: http://svn.redmine.org/redmine/trunk@18863 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Jean-Philippe Lang 4 years ago
parent
commit
970b4b6a5e

+ 1
- 1
app/helpers/members_helper.rb View File

end.compact.uniq end.compact.uniq


if content.present? if content.present?
content_tag('span', content.join(", "), :class => "info")
content_tag('em', content.join(", "), :class => "info")
end end
end end
end end

+ 2
- 2
app/views/members/_edit.html.erb View File

:method => :put) do |f| %> :method => :put) do |f| %>
<p> <p>
<% @roles.each do |role| %> <% @roles.each do |role| %>
<label>
<label class="block">
<%= check_box_tag('membership[role_ids][]', <%= check_box_tag('membership[role_ids][]',
role.id, @member.roles.to_a.include?(role), role.id, @member.roles.to_a.include?(role),
:id => nil, :id => nil,
:disabled => !@member.role_editable?(role)) %> <%= role %> :disabled => !@member.role_editable?(role)) %> <%= role %>
<%= render_role_inheritance(@member, role) %> <%= render_role_inheritance(@member, role) %>
</label><br />
</label>
<% end %> <% end %>
</p> </p>
<%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %> <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>

+ 2
- 2
app/views/principal_memberships/_edit.html.erb View File

:method => :put) do %> :method => :put) do %>
<p> <p>
<% @roles.each do |role| %> <% @roles.each do |role| %>
<label>
<label class="block">
<%= check_box_tag 'membership[role_ids][]', <%= check_box_tag 'membership[role_ids][]',
role.id, @membership.roles.to_a.include?(role), role.id, @membership.roles.to_a.include?(role),
:id => nil, :id => nil,
:disabled => !@membership.role_editable?(role) %> <%= role.name %> :disabled => !@membership.role_editable?(role) %> <%= role.name %>
<%= render_role_inheritance(@membership, role) %> <%= render_role_inheritance(@membership, role) %>
</label><br />
</label>
<% end %> <% end %>
</p> </p>
<%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %> <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>

+ 1
- 4
public/stylesheets/application.css View File



a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; } 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%;} 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;} textarea.text_cf {width:95%; resize:vertical;}
input.string_cf, input.link_cf {width:95%;} input.string_cf, input.link_cf {width:95%;}
select.bool_cf {width:auto !important;} select.bool_cf {width:auto !important;}

Loading…
Cancel
Save