Download as
Browse Code »

Commit 7eabb5ed947e86aa23755a346b53d8a2ce4284f0

Authored by Antonio Terceiro
1 parent 83c318e6
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Revert "Fix placement of "Remove image" checkbox label" 

This reverts commit 83c318e66c66d82671cccaf3acc7f29c2bacf8d2.
Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/views/shared/_show_thumbnail.html.erb
  Diff comments   View file @7eabb5e
@@ -20,6 +20,6 @@ @@ -20,6 +20,6 @@
20 20
21 <% if image.present? && removable %> 21 <% if image.present? && removable %>
22 <div id='image-builder-remove-checkbox'> 22 <div id='image-builder-remove-checkbox'>
23 - <%= labelled_check_box(_('Remove image'), :remove_image, true, false) %> 23 + <%= labelled_form_field(_('Remove image'), i.check_box(:remove_image, {}, true, false))%>
24 </div> 24 </div>
25 <% end %> 25 <% end %>
public/stylesheets/application.scss
  Diff comments   View file @7eabb5e
@@ -2747,11 +2747,12 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation @@ -2747,11 +2747,12 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2747 #blog-image-builder > .formfieldline > .formfield > .formfieldline > .formfield > .formfieldline > label, 2747 #blog-image-builder > .formfieldline > .formfield > .formfieldline > .formfield > .formfieldline > label,
2748 #blog-image-builder > .formfieldline > label, 2748 #blog-image-builder > .formfieldline > label,
2749 #blog-image-builder #change-image > .formfieldline > label, 2749 #blog-image-builder #change-image > .formfieldline > label,
  2750 +#blog-image-builder #image-builder-remove-checkbox > .formfieldline > label,
2750 #profile_change_picture label { 2751 #profile_change_picture label {
2751 display: none; 2752 display: none;
2752 } 2753 }
2753 -#profile_change_picture #image-builder-remove-checkbox > label {  
2754 - display: inline-block; 2754 +#profile_change_picture #image-builder-remove-checkbox > .formfieldline > label {
  2755 + display: block;
2755 } 2756 }
2756 #profile_change_picture img { 2757 #profile_change_picture img {
2757 margin-left: 10px; 2758 margin-left: 10px;