Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Replace old margint and no-margint with BS4 equivalents

Matthew Kennedy483e8356ba24
diff --git a/backend/app/views/spree/admin/orders/customer_details/_form.html.erb b/backend/app/views/spree/admin/orders/customer_details/_form.html.erb
index 2ecc7d4673..5b0842b1be 100644
--- a/backend/app/views/spree/admin/orders/customer_details/_form.html.erb
+++ b/backend/app/views/spree/admin/orders/customer_details/_form.html.erb
@@ -33,7 +33,7 @@
</span>
</div>
<% else %>
- <div class="radio no-margint">
+ <div class="radio mt-0">
<%= label_tag :guest_checkout_true do %>
<%= radio_button_tag :guest_checkout, true, guest %>
<%= Spree.t(:say_yes) %>
diff --git a/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb b/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb
index 9ea0b9472c..57af22041a 100644
--- a/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb
+++ b/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb
@@ -24,7 +24,7 @@
</div>
</div>
<% end %>
- <div id="card_form<%= payment_method.id %>" class="margint row" data-hook>
+ <div id="card_form<%= payment_method.id %>" class="mt-3 row" data-hook>
<% param_prefix = "payment_source[#{payment_method.id}]" %>
<div data-hook="card_number" class="form-group col-12">
diff --git a/backend/app/views/spree/admin/promotions/_actions.html.erb b/backend/app/views/spree/admin/promotions/_actions.html.erb
index 83732a627c..90145b15b5 100644
--- a/backend/app/views/spree/admin/promotions/_actions.html.erb
+++ b/backend/app/views/spree/admin/promotions/_actions.html.erb
@@ -18,7 +18,7 @@
<% end %>
<%= form_for @promotion, url: spree.admin_promotion_path(@promotion), method: :put do |f| %>
- <div id="actions" class="filter_list margint">
+ <div id="actions" class="filter_list mt-3">
<% if @promotion.actions.any? %>
<%= render partial: 'promotion_action', collection: @promotion.actions %>
<% else %>
diff --git a/backend/app/views/spree/admin/promotions/_rules.html.erb b/backend/app/views/spree/admin/promotions/_rules.html.erb
index 509c205fae..ed5f654ebe 100644
--- a/backend/app/views/spree/admin/promotions/_rules.html.erb
+++ b/backend/app/views/spree/admin/promotions/_rules.html.erb
@@ -29,7 +29,7 @@
<% end %>
</div>
- <div id="rules" class="filter_list margint">
+ <div id="rules" class="filter_list mt-3">
<% if @promotion.rules.any? %>
<%= render partial: 'promotion_rule', collection: @promotion.rules, locals: {} %>
<% else %>
diff --git a/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb b/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
index a28bed5e9b..585a229c2f 100644
--- a/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
+++ b/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
@@ -23,7 +23,7 @@
<% end %>
</div>
<% if promotion_action.calculator.respond_to?(:preferences) %>
- <div class="alert alert-info js-warning margint mb-0">
+ <div class="alert alert-info js-warning mt-3 mb-0">
<%= Spree.t(:calculator_settings_warning) %>
</div>
<% end %>
diff --git a/backend/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb b/backend/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
index d60304609c..7c4d187f22 100644
--- a/backend/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
+++ b/backend/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
@@ -21,7 +21,7 @@
<% end %>
</div>
<% if promotion_action.calculator.respond_to?(:preferences) %>
- <div class="alert alert-info js-warning margint mb-0">
+ <div class="alert alert-info js-warning mt-3 mb-0">
<%= Spree.t(:calculator_settings_warning) %>
</div>
<% end %>
diff --git a/backend/app/views/spree/admin/reimbursements/edit.html.erb b/backend/app/views/spree/admin/reimbursements/edit.html.erb
index 7939b730b1..b327982427 100644
--- a/backend/app/views/spree/admin/reimbursements/edit.html.erb
+++ b/backend/app/views/spree/admin/reimbursements/edit.html.erb
@@ -66,7 +66,7 @@
</div>
<% end %>
-<fieldset class="margint">
+<fieldset class="mt-3">
<legend><%= Spree.t(:calculated_reimbursements) %></legend>
<div class="table-responsive">
<table class="table table-condensed table-bordered">