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.

Improve small forms UX to center them on screen (#12866)

Damian Legawiec72cd667c74a5
diff --git a/admin/app/views/spree/admin/custom_domains/edit.html.erb b/admin/app/views/spree/admin/custom_domains/edit.html.erb
index 584c41c31a..acbbe4c5d6 100644
--- a/admin/app/views/spree/admin/custom_domains/edit.html.erb
+++ b/admin/app/views/spree/admin/custom_domains/edit.html.erb
@@ -7,7 +7,7 @@
<%= form_for @object, url: spree.admin_custom_domain_path(@object) do |f| %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= render partial: 'form', locals: { f: f } %>
<%= render partial: 'spree/admin/shared/edit_resource_links', locals: { f: f } %>
</div>
diff --git a/admin/app/views/spree/admin/custom_domains/new.html.erb b/admin/app/views/spree/admin/custom_domains/new.html.erb
index 391f6482c6..3a46b466d5 100644
--- a/admin/app/views/spree/admin/custom_domains/new.html.erb
+++ b/admin/app/views/spree/admin/custom_domains/new.html.erb
@@ -7,7 +7,7 @@
<%= form_for @object, url: spree.admin_custom_domains_path do |f| %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= render partial: 'form', locals: { f: f } %>
<%= render partial: 'spree/admin/shared/new_resource_links' %>
</div>
diff --git a/admin/app/views/spree/admin/integrations/new.html.erb b/admin/app/views/spree/admin/integrations/new.html.erb
index eb9eecd31e..3e79dc7286 100644
--- a/admin/app/views/spree/admin/integrations/new.html.erb
+++ b/admin/app/views/spree/admin/integrations/new.html.erb
@@ -9,6 +9,10 @@
<%= form.hidden_field :type %>
<%= form.hidden_field :active, value: true %>
- <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>
- <%= render 'spree/admin/shared/new_resource_links' %>
+ <div class="row">
+ <div class="col-lg-6 offset-lg-3">
+ <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>
+ <%= render 'spree/admin/shared/new_resource_links' %>
+ </div>
+ </div>
<% end %>
diff --git a/admin/app/views/spree/admin/oauth_applications/edit.html.erb b/admin/app/views/spree/admin/oauth_applications/edit.html.erb
index 2b23aa1952..1620f3fc6c 100644
--- a/admin/app/views/spree/admin/oauth_applications/edit.html.erb
+++ b/admin/app/views/spree/admin/oauth_applications/edit.html.erb
@@ -6,7 +6,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= form_for [:admin, @oauth_application] do |f| %>
<div class="card mb-4">
<div class="card-body">
diff --git a/admin/app/views/spree/admin/oauth_applications/new.html.erb b/admin/app/views/spree/admin/oauth_applications/new.html.erb
index 0abdf22d5f..66f04eddce 100644
--- a/admin/app/views/spree/admin/oauth_applications/new.html.erb
+++ b/admin/app/views/spree/admin/oauth_applications/new.html.erb
@@ -10,7 +10,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= turbo_frame_tag 'new_oauth_application' do %>
<%= form_for [:admin, @oauth_application] do |f| %>
<div class="card mb-4">
diff --git a/admin/app/views/spree/admin/payments/new.html.erb b/admin/app/views/spree/admin/payments/new.html.erb
index 3e75ff9ebd..0500a5bfdb 100644
--- a/admin/app/views/spree/admin/payments/new.html.erb
+++ b/admin/app/views/spree/admin/payments/new.html.erb
@@ -1,7 +1,7 @@
<%= render 'spree/admin/orders/header' %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= render 'spree/admin/shared/error_messages', target: @payment %>
<%= form_with url: spree.admin_order_payments_path(@order), model: @payment, method: :post do |f| %>
diff --git a/admin/app/views/spree/admin/promotions/_actions.html.erb b/admin/app/views/spree/admin/promotions/_actions.html.erb
index 2feb3827a9..248e01593d 100644
--- a/admin/app/views/spree/admin/promotions/_actions.html.erb
+++ b/admin/app/views/spree/admin/promotions/_actions.html.erb
@@ -1,5 +1,5 @@
<div class="card mb-4 bg-transparent">
- <div class="card-header d-flex justify-content-between border-0">
+ <div class="card-header d-flex justify-content-between border-0 px-2">
<h5 class="card-title">
<%= icon('bolt', class: 'mr-2') %>
<%= Spree.t(:promotion_actions) %>
diff --git a/admin/app/views/spree/admin/promotions/_rules.html.erb b/admin/app/views/spree/admin/promotions/_rules.html.erb
index 31e94aff1e..7546da767f 100644
--- a/admin/app/views/spree/admin/promotions/_rules.html.erb
+++ b/admin/app/views/spree/admin/promotions/_rules.html.erb
@@ -1,5 +1,5 @@
<div class="card mb-4 bg-transparent">
- <div class="card-header d-flex justify-content-between">
+ <div class="card-header d-flex justify-content-between px-2">
<h5 class="card-title">
<%= icon('checklist', class: 'mr-2') %>
<%= Spree.t(:rules) %>
diff --git a/admin/app/views/spree/admin/properties/edit.html.erb b/admin/app/views/spree/admin/properties/edit.html.erb
index cab87932b2..2d10ae9d64 100644
--- a/admin/app/views/spree/admin/properties/edit.html.erb
+++ b/admin/app/views/spree/admin/properties/edit.html.erb
@@ -5,11 +5,15 @@
<%= form_for [:admin, @property] do |f| %>
- <div class="card mb-4">
- <div class="card-body">
- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
- <%= render 'form', f: f %>
+ <div class="row">
+ <div class="col-lg-6 offset-lg-3">
+ <div class="card mb-4">
+ <div class="card-body">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
+ <%= render 'form', f: f %>
+ </div>
+ </div>
+ <%= render 'spree/admin/shared/edit_resource_links', f: f %>
</div>
</div>
- <%= render 'spree/admin/shared/edit_resource_links', f: f %>
<% end %>
diff --git a/admin/app/views/spree/admin/properties/new.html.erb b/admin/app/views/spree/admin/properties/new.html.erb
index 27a43a7958..f148b73ff5 100644
--- a/admin/app/views/spree/admin/properties/new.html.erb
+++ b/admin/app/views/spree/admin/properties/new.html.erb
@@ -4,11 +4,15 @@
<% end %>
<%= form_for [:admin, @property] do |f| %>
- <div class="card mb-4">
- <div class="card-body">
- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
- <%= render 'form', f: f %>
+ <div class="row">
+ <div class="col-lg-6 offset-lg-3">
+ <div class="card mb-4">
+ <div class="card-body">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
+ <%= render 'form', f: f %>
+ </div>
+ </div>
+ <%= render 'spree/admin/shared/new_resource_links' %>
</div>
</div>
- <%= render 'spree/admin/shared/new_resource_links' %>
<% end %>
diff --git a/admin/app/views/spree/admin/reimbursement_types/edit.html.erb b/admin/app/views/spree/admin/reimbursement_types/edit.html.erb
index d6c66783f1..9ad58248e7 100644
--- a/admin/app/views/spree/admin/reimbursement_types/edit.html.erb
+++ b/admin/app/views/spree/admin/reimbursement_types/edit.html.erb
@@ -6,7 +6,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= form_with model: @reimbursement_type, :url => object_url, :method => :put, scope: :reimbursement_type do |reimbursement_form| %>
<%= render partial: 'form', locals: { f: reimbursement_form } %>
<%= render 'spree/admin/shared/edit_resource_links', f: reimbursement_form %>
diff --git a/admin/app/views/spree/admin/reimbursement_types/new.html.erb b/admin/app/views/spree/admin/reimbursement_types/new.html.erb
index 83dff57613..ddbc2a609d 100644
--- a/admin/app/views/spree/admin/reimbursement_types/new.html.erb
+++ b/admin/app/views/spree/admin/reimbursement_types/new.html.erb
@@ -7,7 +7,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= form_for [:admin, @reimbursement_type] do |reimbursement_form| %>
<%= render partial: 'form', locals: { f: reimbursement_form } %>
<%= render 'spree/admin/shared/new_resource_links' %>
diff --git a/admin/app/views/spree/admin/shared/named_types/_edit.html.erb b/admin/app/views/spree/admin/shared/named_types/_edit.html.erb
index c0814bb37b..1558cbf9ab 100644
--- a/admin/app/views/spree/admin/shared/named_types/_edit.html.erb
+++ b/admin/app/views/spree/admin/shared/named_types/_edit.html.erb
@@ -6,7 +6,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= form_for [:admin, @object] do |f| %>
<%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
<%= render 'spree/admin/shared/edit_resource_links', f: f %>
diff --git a/admin/app/views/spree/admin/shared/named_types/_new.html.erb b/admin/app/views/spree/admin/shared/named_types/_new.html.erb
index a072762a21..1a34d1a343 100644
--- a/admin/app/views/spree/admin/shared/named_types/_new.html.erb
+++ b/admin/app/views/spree/admin/shared/named_types/_new.html.erb
@@ -6,7 +6,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= form_for [:admin, @object] do |f| %>
<%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
<%= render 'spree/admin/shared/new_resource_links' %>
diff --git a/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb b/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb
index acde14f347..b7dae6e7ab 100644
--- a/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb
+++ b/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb
@@ -29,7 +29,7 @@
<div class="d-flex align-items-center px-3 ml-3">
<%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link }) if can?(:edit, taxon) %>
- <div class="dropdown ml-2 h-100">
+ <div class="dropdown h-100">
<button class="btn btn-light btn-sm px-1 h-100" type="button" id="dropdownMenuButton-<%= taxon.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<%= icon('dots-vertical', class: 'mr-0') %>
</button>
diff --git a/admin/app/views/spree/admin/taxonomies/edit.html.erb b/admin/app/views/spree/admin/taxonomies/edit.html.erb
index 8121a3eb62..3ef4fa1392 100644
--- a/admin/app/views/spree/admin/taxonomies/edit.html.erb
+++ b/admin/app/views/spree/admin/taxonomies/edit.html.erb
@@ -10,7 +10,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= form_for [:admin, @taxonomy] do |f| %>
<div class="card mb-4">
<div class="card-body">
diff --git a/admin/app/views/spree/admin/taxonomies/new.html.erb b/admin/app/views/spree/admin/taxonomies/new.html.erb
index 91196c8d1e..e0fdd02002 100644
--- a/admin/app/views/spree/admin/taxonomies/new.html.erb
+++ b/admin/app/views/spree/admin/taxonomies/new.html.erb
@@ -5,7 +5,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-lg-6 offset-lg-3">
<%= form_for [:admin, @taxonomy] do |f| %>
<div class="card mb-4">
<div class="card-body">
diff --git a/admin/app/views/spree/admin/users/new.html.erb b/admin/app/views/spree/admin/users/new.html.erb
index 03796e47bf..8143ff5817 100644
--- a/admin/app/views/spree/admin/users/new.html.erb
+++ b/admin/app/views/spree/admin/users/new.html.erb
@@ -4,11 +4,15 @@
<% end %>
<%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>
- <div class="card mb-4">
- <div class="card-body">
- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
- <%= render 'form', f: f %>
+ <div class="row">
+ <div class="col-lg-6 offset-lg-3">
+ <div class="card mb-4">
+ <div class="card-body">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
+ <%= render 'form', f: f %>
+ </div>
+ </div>
+ <%= render 'spree/admin/shared/new_resource_links' %>
</div>
</div>
- <%= render 'spree/admin/shared/new_resource_links' %>
<% end %>