change default buttons to btn-light

Author: jdugarte

README.md

@@ -92,7 +92,7 @@ generates a form group, with two buttons: Save (a dropdown menu, that includes '
         <button type='submit' name='next_action' class='dropdown-item submitbar-new' value='new'>Save and new</button>
       </div>
     </div>
-    <a class="btn btn-default submitbar-cancel" rel="nofollow" href="/things">Cancel</a>
+    <a class="btn btn-light submitbar-cancel" rel="nofollow" href="/things">Cancel</a>
   </div>
 </div>
 ```
@@ -152,7 +152,7 @@ This is the actual code of the default partial (located in app/views/bootstrap_f
       <%= link_to text, url, options %>
     <% end %>
     <% if show_cancel_button %>
-      <%= link_to cancel_button_text, cancel_button_url, class: "btn btn-default submitbar-cancel", rel: "nofollow" %>
+      <%= link_to cancel_button_text, cancel_button_url, class: "btn btn-light submitbar-cancel", rel: "nofollow" %>
     <% end %>
   </div>
   <% if right_buttons.any? %>

app/assets/javascripts/bootstrap_form_extensions/scheduler.js

@@ -139,7 +139,7 @@
              "        <div class='modal-body'>" + this.scheduleTable() + this.linksAllNone() + "</div>" +
              "        <div class='modal-footer'>" +
              "          <button class='btn btn-primary apply' type='button' data-dismiss='modal'>Apply</button>" +
-             "          <button class='btn btn-default cancel' type='button' data-dismiss='modal'>Cancel</button>" +
+             "          <button class='btn btn-light cancel' type='button' data-dismiss='modal'>Cancel</button>" +
              "        </div>" +
              "      </div>" +
              "    </div>" +

app/views/bootstrap_form_extensions/_submit_bar.html.erb

@@ -28,7 +28,7 @@
       <%= link_to text, url, options %>
     <% end %>
     <% if show_cancel_button %>
-      <%= link_to cancel_button_text, cancel_button_url, class: 'btn btn-default submitbar-cancel', rel: 'nofollow' %>
+      <%= link_to cancel_button_text, cancel_button_url, class: 'btn btn-light submitbar-cancel', rel: 'nofollow' %>
     <% end %>
   </div>
   <% if right_buttons.any? %>

lib/bootstrap_form_extensions/submit_bar.rb

@@ -54,7 +54,7 @@ def parse_extra_buttons_for_submit_bar buttons, type
       buttons.map do |options|
         text = options.delete :text
         url  = options.delete :url
-        options[:class] = merge_css_classes 'btn', 'btn-default', "submitbar-#{type}-button", options[:class]
+        options[:class] = merge_css_classes 'btn', 'btn-light', "submitbar-#{type}-button", options[:class]
         options[:rel] ||= "nofollow"
         { text: text, url: url, options: options }
       end

test/arrayed_field_test.rb

@@ -8,22 +8,22 @@ def setup
   end
 
   test "arrayed_text_field with default values" do
-    expected = '<div class="form-group"><label class="control-label col-2" for="thing_list">List</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="text" id="" class="form-control" data-name="thing[list][]" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-11"><input type="text" name="thing[list][]" id="thing_list_" value="One" class="form-control" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-11"><input type="text" name="thing[list][]" id="thing_list_" value="Two" class="form-control" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-default add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
+    expected = '<div class="form-group"><label class="control-label col-2" for="thing_list">List</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="text" id="" class="form-control" data-name="thing[list][]" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-11"><input type="text" name="thing[list][]" id="thing_list_" value="One" class="form-control" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-11"><input type="text" name="thing[list][]" id="thing_list_" value="Two" class="form-control" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-light add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
     assert_equal expected, @builder.arrayed_text_field(:list)
   end
 
   test "arrayed_url_field with default values" do
-    expected = '<div class="form-group"><label class="control-label col-2" for="thing_urls">Urls</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="url" id="" class="form-control" data-name="thing[urls][]" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-11"><input type="url" name="thing[urls][]" id="thing_urls_" value="www.example1.com" class="form-control" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-11"><input type="url" name="thing[urls][]" id="thing_urls_" value="www.example2.com" class="form-control" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-default add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
+    expected = '<div class="form-group"><label class="control-label col-2" for="thing_urls">Urls</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="url" id="" class="form-control" data-name="thing[urls][]" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-11"><input type="url" name="thing[urls][]" id="thing_urls_" value="www.example1.com" class="form-control" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-11"><input type="url" name="thing[urls][]" id="thing_urls_" value="www.example2.com" class="form-control" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-light add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
     assert_equal expected, @builder.arrayed_url_field(:urls)
   end
 
   test "ArrayedField, with nonexistent attribute, assumes the value is an empty array" do
-    expected = '<div class="form-group"><label class="control-label col-2" for="thing_nonexistent">Nonexistent</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="text" id="" class="form-control" data-name="thing[nonexistent][]" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"></div><div class="row mt-1"><div class="col-12"><a class="btn btn-default add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
+    expected = '<div class="form-group"><label class="control-label col-2" for="thing_nonexistent">Nonexistent</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="text" id="" class="form-control" data-name="thing[nonexistent][]" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"></div><div class="row mt-1"><div class="col-12"><a class="btn btn-light add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
     assert_equal expected, @builder.arrayed_text_field(:nonexistent)
   end
 
   test "ArrayedField, with non-array attribute, assumes the value is an empty array" do
-    expected = '<div class="form-group"><label class="control-label col-2 required" for="thing_name">Name</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="text" id="" class="form-control" data-name="thing[name][]" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"></div><div class="row mt-1"><div class="col-12"><a class="btn btn-default add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
+    expected = '<div class="form-group"><label class="control-label col-2 required" for="thing_name">Name</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-11"><input type="text" id="" class="form-control" data-name="thing[name][]" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"></div><div class="row mt-1"><div class="col-12"><a class="btn btn-light add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
     assert_equal expected, @builder.arrayed_text_field(:name)
   end
 
@@ -33,19 +33,19 @@ def setup
   end
 
   test "arrayed_json_field with default values" do
-    expected = '<div class="form-group"><label class="control-label col-2" for="thing_variables">Variables</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-2"><input type="text" id="" class="form-control" placeholder="name" data-name="thing[variables][][name]" /></div><div class="col-2"><input type="text" id="" class="form-control" placeholder="value" data-name="thing[variables][][value]" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-2"><input type="text" name="thing[variables][][name]" id="thing_variables__name" class="form-control" placeholder="name" /></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-2"><input type="text" name="thing[variables][][name]" id="thing_variables__name" class="form-control" placeholder="name" /></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-default add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
+    expected = '<div class="form-group"><label class="control-label col-2" for="thing_variables">Variables</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-2"><input type="text" id="" class="form-control" placeholder="name" data-name="thing[variables][][name]" /></div><div class="col-2"><input type="text" id="" class="form-control" placeholder="value" data-name="thing[variables][][value]" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-2"><input type="text" name="thing[variables][][name]" id="thing_variables__name" class="form-control" placeholder="name" /></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-2"><input type="text" name="thing[variables][][name]" id="thing_variables__name" class="form-control" placeholder="name" /></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-light add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>'
     assert_equal expected, @builder.arrayed_json_field(:variables, %i[ name value ])
   end
 
   test "arrayed_json_field with custom input types" do
     expected = <<-HTML.chomp
 <div class="form-group"><label class="control-label col-2" for="thing_variables">Variables</label><div class="col-10"><div data-arrayed-field="true"><div class="blueprint-for-arrayed-field" style="display:none;"><div class="row mt-1"><div class="col-2"><select id="" class="form-control" data-name="thing[variables][][name]"><option value="var1">Variable One</option>
 <option value="var2">Variable Two</option>
-<option value="var3">Variable Three</option></select></div><div class="col-2"><input type="text" id="" class="form-control" placeholder="value" data-name="thing[variables][][value]" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-2"><select name="thing[variables][][name]" id="thing_variables__name" class="form-control"><option value="var1">Variable One</option>
+<option value="var3">Variable Three</option></select></div><div class="col-2"><input type="text" id="" class="form-control" placeholder="value" data-name="thing[variables][][value]" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="arrayed-field-rows"><div class="row mt-1"><div class="col-2"><select name="thing[variables][][name]" id="thing_variables__name" class="form-control"><option value="var1">Variable One</option>
 <option value="var2">Variable Two</option>
-<option value="var3">Variable Three</option></select></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-2"><select name="thing[variables][][name]" id="thing_variables__name" class="form-control"><option value="var1">Variable One</option>
+<option value="var3">Variable Three</option></select></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div><div class="row mt-1"><div class="col-2"><select name="thing[variables][][name]" id="thing_variables__name" class="form-control"><option value="var1">Variable One</option>
 <option value="var2">Variable Two</option>
-<option value="var3">Variable Three</option></select></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-default add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>
+<option value="var3">Variable Three</option></select></div><div class="col-2"><input type="text" name="thing[variables][][value]" id="thing_variables__value" class="form-control" placeholder="value" /></div><div class="col-1"><a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a></div></div></div><div class="row mt-1"><div class="col-12"><a class="btn btn-light add-arrayed-field-row" href="javascript:void(0);">+</a></div></div></div></div></div>
     HTML
     assert_equal expected, @builder.arrayed_json_field(:variables, [ { name: { type: :select, options: options_for_variables } }, :value ])
   end

test/javascripts/arrayed_field_spec.js

@@ -45,7 +45,7 @@ describe("ArrayedField", function() {
               +'        <input type="url" id="" class="form-control" data-name="thing[urls][]" />'
               +'      </div>'
               +'      <div class="col-1">'
-              +'        <a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a>'
+              +'        <a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a>'
               +'      </div>'
               +'    </div>'
               +'  </div>'
@@ -55,21 +55,21 @@ describe("ArrayedField", function() {
               +'        <input type="url" id="" class="form-control" name="thing[urls][]" />'
               +'      </div>'
               +'      <div class="col-1">'
-              +'        <a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a>'
+              +'        <a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a>'
               +'      </div>'
               +'    </div>'
               +'    <div class="row mt-1">'
               +'      <div class="col-11">'
               +'        <input type="url" id="" class="form-control" name="thing[urls][]" />'
               +'      </div>'
               +'      <div class="col-1">'
-              +'        <a class="btn btn-default remove-arrayed-field-row" href="javascript:void(0);">&times;</a>'
+              +'        <a class="btn btn-light remove-arrayed-field-row" href="javascript:void(0);">&times;</a>'
               +'      </div>'
               +'    </div>'
               +'  </div>'
               +'  <div class="row mt-1">'
               +'    <div class="col-12">'
-              +'      <a class="btn btn-default add-arrayed-field-row" href="javascript:void(0);">+</a>'
+              +'      <a class="btn btn-light add-arrayed-field-row" href="javascript:void(0);">+</a>'
               +'    </div>'
               +'  </div>'
               +'</div>'

test/submit_bar_test.rb

@@ -27,7 +27,7 @@ def setup
               </button>
           </div>
       </div>
-      <a class="btn btn-default submitbar-cancel" rel="nofollow" href="/things">Cancel</a>
+      <a class="btn btn-light submitbar-cancel" rel="nofollow" href="/things">Cancel</a>
   </div>
 </div>
     HTML