summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2019-10-26 06:31:39 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2019-10-26 06:31:39 +0000
commit970b4b6a5ec1834c5c8abcc52f9b8b8bb2a05b34 (patch)
tree6f74cda7e54aeb43bd04f0436f2b0c8a824a7e2d
parentb4138257f0f541850f0f1dc77d02ab93d2e4d619 (diff)
downloadredmine-970b4b6a5ec1834c5c8abcc52f9b8b8bb2a05b34.tar.gz
redmine-970b4b6a5ec1834c5c8abcc52f9b8b8bb2a05b34.zip
Styling .info selector is not specific enough.
git-svn-id: http://svn.redmine.org/redmine/trunk@18863 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/members_helper.rb2
-rw-r--r--app/views/members/_edit.html.erb4
-rw-r--r--app/views/principal_memberships/_edit.html.erb4
-rw-r--r--public/stylesheets/application.css5
4 files changed, 6 insertions, 9 deletions
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 11e843099..eef03218c 100644
--- 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 e3c5ec747..8b05ae92f 100644
--- 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 d0ab4f10a..224303b7a 100644
--- 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 0abd4fdae..88be93c37 100644
--- 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;}