Refs #3038 : Remove form-without-label wrapper

3 files changed, 12 insertions, 12 deletions

diff --git a/app/views/devise/confirmations/new.html.slim b/app/views/devise/confirmations/new.html.slim
index caaf7ae10..30194fdfa 100644
--- a/app/views/devise/confirmations/new.html.slim
+++ b/app/views/devise/confirmations/new.html.slim
@@ -4,9 +4,9 @@
   .col-md-4.login
     .panel.panel-default
       .panel-heading = t('.title')
-      
+
       .panel-body
-        = simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :wrapper => "form_without_label", html: { :class => 'form-horizontal user', method: :post } ) do |form|
+        = simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), html: { :class => 'form-horizontal user', method: :post } ) do |form|
           = form.input :email, :label => false, input_html: { :class => "form-control" }
           .row
             .col-md-12
@@ -14,4 +14,4 @@
 
           .row.options
             .col-md-12.new_password
-              = link_to t('devise.links.sign_in'), new_session_path(resource_name)
\ No newline at end of file
+              = link_to t('devise.links.sign_in'), new_session_path(resource_name)
diff --git a/app/views/devise/sessions/new.html.slim b/app/views/devise/sessions/new.html.slim
index c69f9dc3b..5f4fec741 100644
--- a/app/views/devise/sessions/new.html.slim
+++ b/app/views/devise/sessions/new.html.slim
@@ -4,10 +4,10 @@
   .col-md-4.login
     .panel.panel-default
       .panel-body
-        = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :wrapper => "form_without_label", html: { :class => 'form-horizontal session_new' } ) do |form|
-          
+        = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), html: { :class => 'form-horizontal session_new' } ) do |form|
+
           = form.input :email, :label => false, input_html: { :class => "form-control" }
-          
+
           .row
             .col-md-6
               = form.input :password, :as => :password, :label => false, input_html: { :class => "form-control" }
@@ -19,7 +19,7 @@
             .col-md-6
               - if devise_mapping.rememberable?
                 = form.input :remember_me, :as => :boolean if devise_mapping.rememberable?
-              
+
             .col-md-6.new_password
               = link_to t("devise.links.new_password"), new_password_path(resource_name)
 
@@ -28,7 +28,7 @@
                 - if devise_mapping.confirmable? && controller_name != 'confirmations'
                   br
                   = link_to t("devise.links.new_confirmation"), new_confirmation_path(resource_name)
-                  
+
     / FIXME ref #819
     - if false
-      = render partial: 'devise/shared/form_registration', locals: { organisation: (resource.organisation || Organisation.new) }
\ No newline at end of file
+      = render partial: 'devise/shared/form_registration', locals: { organisation: (resource.organisation || Organisation.new) }
diff --git a/app/views/devise/shared/_form_registration.html.slim b/app/views/devise/shared/_form_registration.html.slim
index 5421ddc29..5f18ece87 100644
--- a/app/views/devise/shared/_form_registration.html.slim
+++ b/app/views/devise/shared/_form_registration.html.slim
@@ -2,12 +2,12 @@
   .panel.panel-default
     .panel-heading = t('devise.registrations.new.title')
     .panel-body
-      = simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :wrapper => "form_without_label", html: { class: "form-horizontal registration_new" } ) do |form|
+      = simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: { class: "form-horizontal registration_new" } ) do |form|
         = form.simple_fields_for :organisation, organisation do |organisation|
           = organisation.input :name, :label => false, input_html: { :class => "form-control" }
-        
+
         = form.input :name, :label => false, input_html: { :class => "form-control" }
         = form.input :email, :label => false, input_html: { :class => "form-control" }
         = form.input :password, :as => :password, :label => false, input_html: { :class => "form-control" }
         = form.input :password_confirmation, :as => :password, :label => false, input_html: { :class => "form-control" }
-        = form.button :submit, t("devise.registrations.new.commit"), :class => "btn-info"
\ No newline at end of file
+        = form.button :submit, t("devise.registrations.new.commit"), :class => "btn-info"