1
Download as
Browse Code »

Commit 92f1244691a2c7ff8c376924d6e7ef310e3d3740

Authored by Antonio Terceiro
1 parent 480cde7b
Exists in stable-1.2

Fix placement of "Remove image" checkbox label 

(cherry picked from commit 83c318e66c66d82671cccaf3acc7f29c2bacf8d2)
Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
app/views/shared/_show_thumbnail.html.erb
  Diff comments   View file @92f1244
@@ -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_form_field(_('Remove image'), i.check_box(:remove_image, {}, true, false))%> 23 + <%= labelled_check_box(_('Remove image'), :remove_image, true, false) %>
24 </div> 24 </div>
25 <% end %> 25 <% end %>
public/stylesheets/application.css
  Diff comments   View file @92f1244
@@ -2748,12 +2748,11 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation @@ -2748,12 +2748,11 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2748 #blog-image-builder > .formfieldline > .formfield > .formfieldline > .formfield > .formfieldline > label, 2748 #blog-image-builder > .formfieldline > .formfield > .formfieldline > .formfield > .formfieldline > label,
2749 #blog-image-builder > .formfieldline > label, 2749 #blog-image-builder > .formfieldline > label,
2750 #blog-image-builder #change-image > .formfieldline > label, 2750 #blog-image-builder #change-image > .formfieldline > label,
2751 -#blog-image-builder #image-builder-remove-checkbox > .formfieldline > label,  
2752 #profile_change_picture label { 2751 #profile_change_picture label {
2753 display: none; 2752 display: none;
2754 } 2753 }
2755 -#profile_change_picture #image-builder-remove-checkbox > .formfieldline > label {  
2756 - display: block; 2754 +#profile_change_picture #image-builder-remove-checkbox > label {
  2755 + display: inline-block;
2757 } 2756 }
2758 #profile_change_picture img { 2757 #profile_change_picture img {
2759 margin-left: 10px; 2758 margin-left: 10px;