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 bulk panel operations tab UI (#12952)

Damian Legawiecf659c134607f
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss b/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss
index dd3757e987..aa8c406092 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss
@@ -3,14 +3,59 @@
align-items: center;
border-radius: $border-radius-lg;
background-color: $white;
- padding: 0.5rem;
box-shadow: $dropdown-box-shadow;
animation: bounceInUp;
animation-duration: 0.5s;
- gap: 0.5rem;
.btn {
- height: 2rem;
+ border-width: 0;
+ padding-top: 0;
+ padding-bottom: 0;
+ height: 2.75rem;
+ border-radius: 0;
+ }
+
+ > * {
+ height: 2.75rem;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ &:first-child {
+ border-top-left-radius: $border-radius-lg;
+ border-bottom-left-radius: $border-radius-lg;
+
+ .btn {
+ border-top-left-radius: $border-radius-lg;
+ border-bottom-left-radius: $border-radius-lg;
+ }
+ }
+
+ &:last-child {
+ border-top-right-radius: $border-radius-lg;
+ border-bottom-right-radius: $border-radius-lg;
+
+ .btn {
+ border-top-right-radius: $border-radius-lg;
+ border-bottom-right-radius: $border-radius-lg;
+ }
+ }
+
+ &:after {
+ content: '';
+ display: block;
+ width: 1px;
+ height: 100%;
+ background-color: $gray-50;
+ }
+
+ &:last-child:after {
+ display: none;
+ }
+ }
+
+ .btn-close {
+ width: 2.5rem;
}
}
@@ -38,11 +83,14 @@
}
.bulk-operations-counter {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- gap: 0.25rem;
- margin-left: 1rem;
- margin-right: 1rem;
- border-left: 1px solid $gray-50;
+ padding-left: 1rem;
+ padding-right: 0;
+
+ .bulk-operations-counter-label {
+ margin-right: 1rem;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.5rem;
+ }
}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
index d7fe1ca9a7..f97f0c843f 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
@@ -184,18 +184,3 @@ button[disabled] .show-when-enabled { display: none; }
min-width: 24px;
height: 24px;
}
-
-.page-link {
- @extend .btn;
- @extend .btn-sm;
- @extend .btn-light;
- @extend .ml-1;
- @extend .p-2;
-
- .ti {
- @extend .mr-0;
- }
-}
-.page-link.disabled {
- cursor: not-allowed;
-}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss b/admin/app/assets/stylesheets/spree/admin/components/_filters.scss
index 33ea4b510a..16f48fc3c5 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_filters.scss
@@ -1,6 +1,6 @@
.filter-wrap {
padding: 0.5rem;
- border-bottom: 1px solid $gray-50;
+ border-bottom: 1px solid $table-border-color;
gap: 0.5rem;
position: sticky;
top: $header-height;
diff --git a/admin/app/helpers/spree/admin/bulk_operations_helper.rb b/admin/app/helpers/spree/admin/bulk_operations_helper.rb
index 8d64132b7b..92ccadda64 100644
--- a/admin/app/helpers/spree/admin/bulk_operations_helper.rb
+++ b/admin/app/helpers/spree/admin/bulk_operations_helper.rb
@@ -82,9 +82,11 @@ module Spree
# render a counter for the bulk operations
# @return [String]
def bulk_operations_counter
- content_tag(:span, class: 'bulk-operations-counter') do
- content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
- Spree.t("admin.selected")
+ content_tag(:div, class: 'bulk-operations-counter') do
+ content_tag(:span, class: 'bulk-operations-counter-label') do
+ content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
+ Spree.t("admin.selected")
+ end
end
end
end
diff --git a/admin/app/views/spree/admin/products/_bulk_operations.html.erb b/admin/app/views/spree/admin/products/_bulk_operations.html.erb
index 6b1ee2c366..6dccca12b9 100644
--- a/admin/app/views/spree/admin/products/_bulk_operations.html.erb
+++ b/admin/app/views/spree/admin/products/_bulk_operations.html.erb
@@ -1,5 +1,7 @@
<div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
<div class="bulk-panel-container">
+ <%= bulk_operations_counter %>
+
<% if can?(:activate, Spree::Product) %>
<%= bulk_action_link(
Spree.t("admin.bulk_ops.products.title.set_status", status: :active),
@@ -20,7 +22,7 @@
<button
type="button"
data-display="static"
- class="btn btn-light px-2 h-100"
+ class="btn btn-light"
data-placement="bottom"
data-toggle="dropdown"
aria-expanded="false"
@@ -81,7 +83,6 @@
</div>
</div>
- <%= bulk_operations_counter %>
<%= bulk_operations_close_button %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/users/index.html.erb b/admin/app/views/spree/admin/users/index.html.erb
index da33cd69ba..932fe2bc1f 100644
--- a/admin/app/views/spree/admin/users/index.html.erb
+++ b/admin/app/views/spree/admin/users/index.html.erb
@@ -22,6 +22,8 @@
<%= render 'spree/admin/shared/bulk_modal' %>
<div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
<div class="bulk-panel-container">
+ <%= bulk_operations_counter %>
+
<% if can?(:manage_tags, Spree.user_class) %>
<%= bulk_action_link(
Spree.t("admin.bulk_ops.users.title.add_tags"),
@@ -36,7 +38,6 @@
url: spree.bulk_remove_tags_admin_users_path
) %>
<% end %>
- <%= bulk_operations_counter %>
<%= bulk_operations_close_button %>
</div>
</div>