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.

Admin: small UX improvements

Damian Legawieca5204b2e7c6f
diff --git a/admin/app/views/spree/admin/option_types/_form.html.erb b/admin/app/views/spree/admin/option_types/_form.html.erb
index 9af493439a..d708e1c7fc 100644
--- a/admin/app/views/spree/admin/option_types/_form.html.erb
+++ b/admin/app/views/spree/admin/option_types/_form.html.erb
@@ -72,15 +72,13 @@
<!-- Inserted elements will be injected before that target. -->
<tr data-nested-form-target="target"></tr>
- <tr>
- <td></td>
- <td colspan="2" class="text-center">
- <button type="button" data-action="nested-form#add" class="btn btn-link" id="add_option_value_button">
+ <tr class="hover-none">
+ <td colspan="4" class="text-center p-1">
+ <button type="button" data-action="nested-form#add" class="btn btn-link py-3 w-100" id="add_option_value_button">
<%= icon('plus') %>
<%= Spree.t(:add_one) %>
</button>
</td>
- <td></td>
</tr>
</tbody>
</table>
diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erb
index a876bbc6b1..6cf107d58b 100644
--- a/admin/app/views/spree/admin/orders/_filters.html.erb
+++ b/admin/app/views/spree/admin/orders/_filters.html.erb
@@ -3,9 +3,9 @@
<div class="filter-wrap border-bottom">
<div class="d-flex flex-column flex-lg-row">
<div class="flex-grow-1 mr-lg-2 mb-3 mb-lg-0">
- <div class="form-control d-flex align-items-center py-0 focus-shadow-blue focus-border-blue shadow-xs">
+ <div class="form-control d-flex align-items-center py-0 focus-shadow-blue focus-border-blue">
<%= icon 'search', class: 'mr-3 text-muted' %>
- <%= text_field_tag 'q[multisearch]', params.dig(:q, :multisearch), class: "form-control-plaintext js-quick-search px-0", placeholder: 'Search orders' %>
+ <%= search_field_tag 'q[multisearch]', params.dig(:q, :multisearch), class: "form-control-plaintext js-quick-search px-0", placeholder: 'Search orders' %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/orders/_shipment.html.erb b/admin/app/views/spree/admin/orders/_shipment.html.erb
index cca88d9089..80bd684909 100644
--- a/admin/app/views/spree/admin/orders/_shipment.html.erb
+++ b/admin/app/views/spree/admin/orders/_shipment.html.erb
@@ -20,7 +20,7 @@
</div>
<div class="card-body mb-0 p-0">
<div class="shipment-line-items">
- <div class="text-muted text-center border-bottom py-2 px-3 font-weight-bold font-size-sm shipment-line-items__row">
+ <div class="text-muted text-center border-bottom py-2 px-3 font-size-sm shipment-line-items__row">
<span class="text-left">
<%= Spree.t(:item_description) %>
</span>
diff --git a/admin/app/views/spree/admin/products/_filters.html.erb b/admin/app/views/spree/admin/products/_filters.html.erb
index 8bca2135ab..da238c11f8 100644
--- a/admin/app/views/spree/admin/products/_filters.html.erb
+++ b/admin/app/views/spree/admin/products/_filters.html.erb
@@ -1,7 +1,7 @@
<div class="filter-wrap border-bottom">
<div class="d-flex flex-column flex-lg-row">
<%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1 mr-lg-2 mb-3 mb-lg-0', method: :get do %>
- <div class="form-control d-flex align-items-center py-0 focus-shadow-blue focus-border-blue shadow-xs">
+ <div class="form-control d-flex align-items-center py-0 focus-shadow-blue focus-border-blue">
<%= icon 'search', class: 'mr-3 text-muted' %>
<%= text_field_tag :quick_search, nil, class: "form-control-plaintext js-quick-search px-0", placeholder: Spree.t(:search_by) %>
</div>
diff --git a/admin/app/views/spree/admin/products/form/_base.html.erb b/admin/app/views/spree/admin/products/form/_base.html.erb
index 1bc400e6d9..bc2babd6f3 100644
--- a/admin/app/views/spree/admin/products/form/_base.html.erb
+++ b/admin/app/views/spree/admin/products/form/_base.html.erb
@@ -8,7 +8,7 @@
<div class="form-group mb-0">
<%= f.label :description, Spree.t(:description) %>
- <div class="border rounded border-gray-200 mb-0">
+ <div class="border rounded mb-0">
<%= f.text_area :description, { rows: 10, class: "form-control spree-rte", data: { seo_form_target: 'sourceDescriptionInput' } } %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/translations/products/_form.html.erb b/admin/app/views/spree/admin/translations/products/_form.html.erb
index f771519777..35362babb6 100644
--- a/admin/app/views/spree/admin/translations/products/_form.html.erb
+++ b/admin/app/views/spree/admin/translations/products/_form.html.erb
@@ -11,7 +11,7 @@
<td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
<% case field%>
<% when :description %>
- <div class="tinymce-container mb-0">
+ <div class="border rounded mb-0">
<%= text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { rows: 10, class: "form-control spree-rte", readonly: readonly, contenteditable: !readonly } %>
</div>
<% else %>
diff --git a/admin/app/views/spree/admin/variants/form/_dimensions.html.erb b/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
index af823d8571..332f192c46 100644
--- a/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
@@ -2,14 +2,14 @@
<div class="col-lg-6">
<div class="form-group">
<%= f.label :width %>
- <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <div class="form-control d-flex align-items-center py-0 focus-border-blue focus-shadow-blue mb-3">
<%= f.text_field :width, value: number_with_precision(f.object.width, precision: 2), class: 'form-control-plaintext pl-0' %>
<%= f.select :dimensions_unit, options_for_select(dimensions_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
</div>
</div>
<div class="form-group">
<%= f.label :height %>
- <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <div class="form-control d-flex align-items-center py-0 focus-border-blue focus-shadow-blue mb-3">
<%= f.text_field :height, value: number_with_precision(f.object.height, precision: 2), class: 'form-control-plaintext pl-0' %>
<%= f.select :dimensions_unit, options_for_select(dimensions_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
</div>
@@ -18,14 +18,14 @@
<div class="col-lg-6">
<div class="form-group">
<%= f.label :depth %>
- <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <div class="form-control d-flex align-items-center py-0 focus-border-blue focus-shadow-blue mb-3">
<%= f.text_field :depth, value: number_with_precision(f.object.depth, precision: 2), class: 'form-control-plaintext pl-0' %>
<%= f.select :dimensions_unit, options_for_select(dimensions_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
</div>
</div>
<div class="form-group">
<%= f.label :weight %>
- <div class="form-control d-flex align-items-center py-0 shadow-xs focus-shadow-blue focus-border-blue mb-3">
+ <div class="form-control d-flex align-items-center py-0 focus-border-blue focus-shadow-blue mb-3">
<%= f.text_field :weight, value: number_with_precision(f.object.weight, precision: 2), class: 'form-control-plaintext pl-0' %>
<%= f.select :weight_unit, options_for_select(weight_units(current_store), f.object.weight_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>
</div>
diff --git a/admin/app/views/spree/admin/variants/form/_pricing.html.erb b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
index 87e6dc1d06..9d95c625b0 100644
--- a/admin/app/views/spree/admin/variants/form/_pricing.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
@@ -40,7 +40,7 @@
<% end %>
</tbody>
</table>
- <div class="card-footer text-center bg-gray-25 text-muted">
+ <div class="card-footer text-center bg-gray-25 text-muted border-top">
<%= Spree.t('admin.variants.currencies_link', link: spree.edit_admin_store_path(current_store)).html_safe %>
</div>
</div>