Download as
Browse Code »

Commit 8a2273e3c0bf5b6089ab5b8a98e0fa54957927fd

Authored by Antonio Terceiro
1 parent 92f12446
Exists in stable-1.2

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

This reverts commit 92f1244691a2c7ff8c376924d6e7ef310e3d3740.
Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/views/shared/_show_thumbnail.html.erb
  Diff comments   View file @8a2273e
... ... @@ -20,6 +20,6 @@
20 20  
21 21 <% if image.present? && removable %>
22 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 24 </div>
25 25 <% end %>
... ...
public/stylesheets/application.css
  Diff comments   View file @8a2273e
... ... @@ -2748,11 +2748,12 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2748 2748 #blog-image-builder > .formfieldline > .formfield > .formfieldline > .formfield > .formfieldline > label,
2749 2749 #blog-image-builder > .formfieldline > label,
2750 2750 #blog-image-builder #change-image > .formfieldline > label,
  2751 +#blog-image-builder #image-builder-remove-checkbox > .formfieldline > label,
2751 2752 #profile_change_picture label {
2752 2753 display: none;
2753 2754 }
2754   -#profile_change_picture #image-builder-remove-checkbox > label {
2755   - display: inline-block;
  2755 +#profile_change_picture #image-builder-remove-checkbox > .formfieldline > label {
  2756 + display: block;
2756 2757 }
2757 2758 #profile_change_picture img {
2758 2759 margin-left: 10px;
... ...