Revert label boolean css and formtastic input

4 files changed, 24 insertions, 20 deletions

diff --git a/app/assets/stylesheets/vendor/formtastic_changes.css.scss b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
index 8eab55de1..72b4d735f 100644
--- a/app/assets/stylesheets/vendor/formtastic_changes.css.scss
+++ b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
@@ -5,17 +5,17 @@
         text-align: right;
     }
 
-    .boolean {
-        // to align horizontally boolean label with other labels
-        // (with the help of customized BooleanInput)
-        label {
-            padding-left: inherit;
-        }
-        // to align vertically checkbox with align text
-        input[type="checkbox"] {
-            margin-top: 0.3em;
-        }
-    }
+    /* .boolean {
+    /*     // to align horizontally boolean label with other labels
+    /*     // (with the help of customized BooleanInput)
+    /*     label {
+    /*         padding-left: inherit;
+    /*     }
+    /*     // to align vertically checkbox with align text
+    /*     input[type="checkbox"] {
+    /*         margin-top: 0.3em;
+    /*     }
+    /* }
 
     .stringish input{
         width: auto;
@@ -51,4 +51,4 @@
         display: initial;
     }
     /* Hack to remove!!!! */
-}
\ No newline at end of file
+}
diff --git a/app/inputs/boolean_input.rb b/app/inputs/boolean_input.rb
index a2b9b92ca..da23c3b93 100644
--- a/app/inputs/boolean_input.rb
+++ b/app/inputs/boolean_input.rb
@@ -1,9 +1,9 @@
 class BooleanInput < Formtastic::Inputs::BooleanInput
-  def label_with_nested_checkbox
-    builder.label(
-      method,
-      label_text,
-      label_html_options.merge(class: "label")
-    ) << "" << check_box_html
-  end
+  # def label_with_nested_checkbox
+  #   builder.label(
+  #     method,
+  #     label_text,
+  #     label_html_options.merge(class: "label")
+  #   ) << "" << check_box_html
+  # end
 end
diff --git a/app/inputs/custom_simple_form/boolean_input.rb b/app/inputs/custom_simple_form/boolean_input.rb
new file mode 100644
index 000000000..1dd456356
--- /dev/null
+++ b/app/inputs/custom_simple_form/boolean_input.rb
@@ -0,0 +1,4 @@
+module CustomSimpleForm
+  class BooleanInput < SimpleForm::Inputs::BooleanInput
+  end
+end
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 279eb3ca8..ceb8624c2 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -24,7 +24,7 @@
           <div class="row options">
             <div class="col-md-6">
               <% if devise_mapping.rememberable? %>
-                <%= form.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
+                <%= form.input :remember_me, :as => :boolean %>
               <% end %>
             </div>
             <div class="col-md-6 new_password">