diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-02-22 00:02:43 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-02-22 00:02:43 +0000 |
| commit | c41b2833c0094748fe74b379ee1720358b894145 (patch) | |
| tree | 24aeed051884dc6d1a8fff224fcd71303186025d | |
| parent | 7ba1f889f859eba5e62d5483951efaf502507512 (diff) | |
| download | redmine-c41b2833c0094748fe74b379ee1720358b894145.tar.gz redmine-c41b2833c0094748fe74b379ee1720358b894145.zip | |
Fix: The green tick is positioned after the label in the new member modals (#28079).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@17207 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/members/_new_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/principal_memberships/_new_form.html.erb | 4 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a70add6f8..9da044c04 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1256,7 +1256,7 @@ module ApplicationHelper link_to_function '', "toggleCheckboxesBySelector('#{selector}')", :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}", - :class => 'toggle-checkboxes' + :class => 'icon icon-checked' end def progress_bar(pcts, options={}) diff --git a/app/views/members/_new_form.html.erb b/app/views/members/_new_form.html.erb index 3fe9187d1..8d5f6053b 100644 --- a/app/views/members/_new_form.html.erb +++ b/app/views/members/_new_form.html.erb @@ -7,7 +7,7 @@ </div> </fieldset> <fieldset class="box"> - <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_link('.roles-selection input') %></legend> + <legend><%= toggle_checkboxes_link('.roles-selection input') %> <%= l(:label_role_plural) %></legend> <div class="roles-selection"> <% User.current.managed_roles(@project).each do |role| %> <label><%= check_box_tag 'membership[role_ids][]', role.id, false, :id => nil %> <%= role %></label> diff --git a/app/views/principal_memberships/_new_form.html.erb b/app/views/principal_memberships/_new_form.html.erb index c49d84993..290e1dd60 100644 --- a/app/views/principal_memberships/_new_form.html.erb +++ b/app/views/principal_memberships/_new_form.html.erb @@ -1,5 +1,5 @@ <fieldset class="box"> - <legend><%= l(:label_project_plural) %> <%= toggle_checkboxes_link('.projects-selection input:enabled') %></legend> + <legend><%= toggle_checkboxes_link('.projects-selection input:enabled') %> <%= l(:label_project_plural) %></legend> <div class="objects-selection"> <div class="projects-selection"> <%= render_project_nested_lists(@projects) do |p| %> @@ -12,7 +12,7 @@ </fieldset> <fieldset class="box"> - <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_link('.roles-selection input') %></legend> + <legend><%= toggle_checkboxes_link('.roles-selection input') %><%= l(:label_role_plural) %></legend> <div class="roles-selection"> <% @roles.each do |role| %> <label> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 48bcbf9bc..369526a9a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -140,8 +140,6 @@ a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repea a#toggle-completed-versions {color:#999;} -a.toggle-checkboxes { margin-left: 5px; padding-left: 12px; background: url(../images/toggle_check.png) no-repeat 0% 50%; } - /***** Dropdown *****/ .drdn {position:relative;} .drdn-trigger { |